From c0af645cf7b70b073b9acb843bc66acbc53cd088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Mon, 9 Mar 2026 17:28:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../price/dto/UpdateLngPricePurPngAppSuDto.java | 2 ++ .../price/vo/LngPricePurPngAppSuDtlVo.java | 2 +- .../price/vo/LngPriceSalesPngAppCuDtlVo.java | 2 +- .../controller/PricePurPngAppController.java | 16 +++++++++++++--- .../controller/PriceSalesPngAppController.java | 16 +++++++++++++--- .../price/mapper/LngPricePurPngAppSuMapper.java | 2 +- .../mapper/LngPriceSalesPngAppCuMapper.java | 2 +- 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java index d87024b..0d6607a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/dto/UpdateLngPricePurPngAppSuDto.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.price.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.*; import com.xjrsoft.common.model.base.BaseModel; import io.swagger.annotations.ApiModelProperty; @@ -97,6 +98,7 @@ public class UpdateLngPricePurPngAppSuDto extends BaseModel implements Serializa */ @LogField(name="价格生效年月",index=10) @ApiModelProperty("价格生效年月(YYYY-MM格式；日期缺省01)") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateFrom; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java index d64cb23..b5a6b9e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPricePurPngAppSuDtlVo.java @@ -41,7 +41,7 @@ public class LngPricePurPngAppSuDtlVo { * 基础量/增量(基础量/增量1/增量2) */ @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") - @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceTypeName") + @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceName") private String priceCode; private String priceName; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java index 9fb7440..fdccb57 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/price/vo/LngPriceSalesPngAppCuDtlVo.java @@ -41,7 +41,7 @@ public class LngPriceSalesPngAppCuDtlVo { * 基础量/增量(基础量/增量1/增量2) */ @ApiModelProperty("基础量/增量(基础量/增量1/增量2)") - @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceTypeName") + @Trans(type = TransType.DIC, id = "2007987645607911425", transToFieldName = "priceName") private String priceCode; private String priceName; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java index 5ce261c..03a6b5e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PricePurPngAppController.java @@ -97,7 +97,7 @@ public class PricePurPngAppController { @Override public UpdateLngPricePurPngAppDto after(DataOperationContent content) { - execAfter(content.getTableName(), content.getIdValue(), "I"); + execAfter("lng_price_pur_png", content.getIdValue(), "I"); return content.getObj(); } }); @@ -130,7 +130,7 @@ public class PricePurPngAppController { @Override public UpdateLngPricePurPngAppDto after(DataOperationContent content) { - execAfter(content.getTableName(), content.getIdValue(), "U"); + execAfter("lng_price_pur_png", content.getIdValue(), "U"); return content.getObj(); } })); @@ -140,7 +140,17 @@ public class PricePurPngAppController { @ApiOperation(value = "删除") @SaCheckPermission("pricePurPngApp:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngPricePurPngAppDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngPricePurPngAppDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngPricePurPngAppDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPricePurPngAppDto after(DataOperationContent content) { + return null; + } + })); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java index 7681c9a..ec0a1c6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/controller/PriceSalesPngAppController.java @@ -97,7 +97,7 @@ public class PriceSalesPngAppController { @Override public UpdateLngPriceSalesPngAppDto after(DataOperationContent content) { - execAfter(content.getTableName(), content.getIdValue(), "I"); + execAfter("lng_price_sales_png", content.getIdValue(), "I"); return content.getObj(); } }); @@ -130,7 +130,7 @@ public class PriceSalesPngAppController { @Override public UpdateLngPriceSalesPngAppDto after(DataOperationContent content) { - execAfter(content.getTableName(), content.getIdValue(), "U"); + execAfter("lng_price_sales_png", content.getIdValue(), "U"); return content.getObj(); } })); @@ -140,7 +140,17 @@ public class PriceSalesPngAppController { @ApiOperation(value = "删除") @SaCheckPermission("priceSalesPngApp:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngPriceSalesPngAppDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngPriceSalesPngAppDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngPriceSalesPngAppDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngPriceSalesPngAppDto after(DataOperationContent content) { + return null; + } + })); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java index 9d4483f..5bbffb0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/price/mapper/LngPricePurPngAppSuMapper.java @@ -22,7 +22,7 @@ public interface LngPricePurPngAppSuMapper extends MPJBaseMapper Date: Mon, 9 Mar 2026 17:33:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20BigDecimal=20=E6=AF=94=E8=BE=83=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9=E4=B8=BAcompareTo=E6=AF=94=E8=BE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pictc/utils/DataLogTools.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index 421c3c8..03c8898 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -893,8 +893,12 @@ public class DataLogTools { flag = isString?StringUtils.isNotEmpty((String)oldVal):true; }else if(newVal!=null && oldVal==null) { flag = isString?StringUtils.isNotEmpty((String)newVal):true; - }else if(newVal!=null && oldVal!=null && !newVal.equals(oldVal)) { - flag = true; + }else if(newVal!=null && oldVal!=null) { + if(BigDecimal.class.equals(item.getJavaType())){ + flag = ((BigDecimal)newVal).compareTo((BigDecimal)oldVal) != 0; + }else{ + flag = !newVal.equals(oldVal); + } } change.setOldValue(parseValue(oldVal,item.getJavaType())); change.setNewValue(parseValue(newVal,item.getJavaType())); @@ -1288,7 +1292,4 @@ public class DataLogTools { return sql.replaceAll(SQL_PLACEHOLDER,tableName); } - - - }