From c211318fea7696043dd72a1527e6576095147966 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 30 Jan 2026 17:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85LNG=E9=94=80=E5=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pictc/utils/DataLogTools.java | 2 +- .../dto/UpdateLngContractSalesDto.java | 47 +++++++++++++------ .../dto/UpdateLngContractSalesLngDiscDto.java | 3 ++ .../dto/UpdateLngContractSalesLngQtyDto.java | 3 ++ .../ContractSalesLngController.java | 6 +-- 5 files changed, 42 insertions(+), 19 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 6b22335..421c3c8 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 @@ -630,7 +630,7 @@ public class DataLogTools { Set> joinClasses = SetUtils.ofCollection(classes); initJoinValue(item,joinTable,joinClasses); } - }else { + }else if(joinValue != null){ Long idValue2 = joinTable.getIdValue(joinValue); if(idValue2==null || idValue2 <=0) { joinTable.setIdValue(joinValue,idValue2); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java index 2df761c..4ed818b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; import com.pictc.annotations.datalog.LogAttrField; @@ -106,6 +107,7 @@ public class UpdateLngContractSalesDto implements Serializable { */ @LogField(name="合同签订日期",index=10) @ApiModelProperty("合同签订日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateSign; /** @@ -113,6 +115,7 @@ public class UpdateLngContractSalesDto implements Serializable { */ @LogField(name="有效期开始",index=11) @ApiModelProperty("有效期开始") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateFrom; /** @@ -120,6 +123,7 @@ public class UpdateLngContractSalesDto implements Serializable { */ @LogField(name="有效期结束",index=12) @ApiModelProperty("有效期结束") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateTo; /** @@ -127,6 +131,7 @@ public class UpdateLngContractSalesDto implements Serializable { */ @LogField(name="确认函开始日",index=13) @ApiModelProperty("确认函开始日") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateCfmFrom; /** @@ -134,6 +139,7 @@ public class UpdateLngContractSalesDto implements Serializable { */ @LogField(name="确认函结束日",index=14) @ApiModelProperty("确认函结束日") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateCfmTo; /** @@ -187,35 +193,46 @@ public class UpdateLngContractSalesDto implements Serializable { /** - * lngContractPurPng + * lngContractSalesLng */ - @ApiModelProperty("lngContractPurPng子表") - @LogJoin(name = "lngContractPurPng子表", + @ApiModelProperty("lngContractSalesLng子表") + @LogJoin(name = "lngContractSalesLng子表", columns = { @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, - caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY) - private List lngContractPurPngList; + caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDto.class, type = JoinType.MANY) + private List lngContractSalesLngList; /** - * lngContractPurPngPoint + * LngContractSalesLngSta */ - @ApiModelProperty("lngContractPurPngPoint子表") - @LogJoin(name = "lngContractPurPngPoint子表", + @ApiModelProperty("LngContractSalesLngSta子表") + @LogJoin(name = "LngContractSalesLngSta子表", columns = { @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, - caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY) - private List lngContractPurPngPointList; + caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngStaDto.class, type = JoinType.MANY) + private List lngContractSalesLngStaList; + /** - * lngContractPurPngQty + * LngContractSalesLngSta + */ + @ApiModelProperty("LngContractSalesLngDisc子表") + @LogJoin(name = "LngContractSalesLngDisc子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDiscDto.class, type = JoinType.MANY) + private List lngContractSalesLngDiscList; + /** + * lngContractSalesLngQty */ - @ApiModelProperty("lngContractPurPngQty子表") - @LogJoin(name = "lngContractPurPngQty子表", + @ApiModelProperty("LngContractSalesLngQty子表") + @LogJoin(name = "LngContractSalesLngQty子表", columns = { @LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT) }, - caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY) - private List lngContractPurPngQtyList; + caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngQtyDto.class, type = JoinType.MANY) + private List lngContractSalesLngQtyList; /** * lngContractApproRel */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java index 9ffcc8c..4061160 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngDiscDto.java @@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.dto; import java.io.Serializable; import java.time.LocalDateTime; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogTable; @@ -50,6 +51,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable { */ @LogField(name="开始日期",index=3) @ApiModelProperty("开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateFrom; /** @@ -57,6 +59,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable { */ @LogField(name="结束日期",index=4) @ApiModelProperty("结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateTo; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java index c776918..39c95bd 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesLngQtyDto.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogTable; @@ -44,6 +45,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable { */ @LogField(name="开始日期",index=2) @ApiModelProperty("开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateFrom; /** @@ -51,6 +53,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable { */ @LogField(name="结束日期",index=3) @ApiModelProperty("结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime dateTo; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java index a624e0d..f74072f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractSalesLngController.java @@ -123,9 +123,9 @@ public class ContractSalesLngController { @SaCheckPermission("contractSalesLng:delete") public R delete(@Valid @RequestBody List ids){ - boolean res = dataService.deleteByIds(UpdateLngContractPurDto.class,ids, new DataOperationListener() { + boolean res = dataService.deleteByIds(UpdateLngContractSalesDto.class,ids, new DataOperationListener() { @Override - public UpdateLngContractPurDto before(DataOperationContent content) { + public UpdateLngContractSalesDto before(DataOperationContent content) { String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", content.getTableName()); List params = Lists.newArrayList(); JdbcParam outParam = JdbcParam.ofString(null).setOut(true); @@ -140,7 +140,7 @@ public class ContractSalesLngController { } @Override - public UpdateLngContractPurDto after(DataOperationContent content) { + public UpdateLngContractSalesDto after(DataOperationContent content) { return null; } });