From 6b799fe8ce80733c3b9a026009a48c4ea7cc839a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Wed, 4 Feb 2026 17:25:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/dto/AddLngContractPurIntDto.java | 5 -- .../dto/AddLngContractSalesIntDto.java | 10 ---- .../contract/dto/UpdateLngContractPIDto.java | 11 +--- .../contract/dto/UpdateLngContractSIDto.java | 11 +--- .../module/contract/vo/LngContractFactVo.java | 4 ++ .../contract/vo/LngContractPurIntVo.java | 51 +---------------- .../contract/vo/LngContractSalesIntVo.java | 55 ------------------- .../impl/ContractPurIntServiceImpl.java | 7 +++ .../impl/ContractSalesIntServiceImpl.java | 1 - .../src/main/resources/bootstrap-dev.yml | 2 +- 10 files changed, 17 insertions(+), 140 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurIntDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurIntDto.java index acd2be8..6a1ba4e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurIntDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractPurIntDto.java @@ -186,10 +186,5 @@ public class AddLngContractPurIntDto extends com.xjrsoft.common.model.base.BaseM */ @ApiModelProperty("备注") private String note; - /** - * 租户id - */ - @ApiModelProperty("租户id") - private Long tenantId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesIntDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesIntDto.java index f75b392..f86ad59 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesIntDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractSalesIntDto.java @@ -5,13 +5,8 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.time.LocalTime; -import java.time.LocalDateTime; import java.math.BigDecimal; -import java.util.List; @@ -191,10 +186,5 @@ public class AddLngContractSalesIntDto extends com.xjrsoft.common.model.base.Bas */ @ApiModelProperty("备注") private String note; - /** - * 租户id - */ - @ApiModelProperty("租户id") - private Long tenantId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPIDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPIDto.java index 8d19d77..b64327c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPIDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractPIDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.contract.dto; import com.pictc.annotations.datalog.*; +import com.xjrsoft.common.model.base.BaseModel; import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ import java.util.List; */ @Data @LogTable(source="lng_contract",name="国际采购合同") -public class UpdateLngContractPIDto implements Serializable { +public class UpdateLngContractPIDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -169,14 +170,6 @@ public class UpdateLngContractPIDto implements Serializable { @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=21) - @ApiModelProperty("租户id") - private Long tenantId; - /** * lngContractPurInt diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSIDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSIDto.java index 382a1ba..04c90f7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSIDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSIDto.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.contract.dto; import com.pictc.annotations.datalog.*; +import com.xjrsoft.common.model.base.BaseModel; import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ import java.util.List; */ @Data @LogTable(source="lng_contract",name="国际销售合同") -public class UpdateLngContractSIDto implements Serializable { +public class UpdateLngContractSIDto extends BaseModel implements Serializable { private static final long serialVersionUID = 1L; @@ -169,14 +170,6 @@ public class UpdateLngContractSIDto implements Serializable { @LogField(name="备注",index=20) @ApiModelProperty("备注") private String note; - - /** - * 租户id - */ - @LogField(name="租户id",index=21) - @ApiModelProperty("租户id") - private Long tenantId; - /** * lngContractSalesInt diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java index 9666c8b..b406eb2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactVo.java @@ -60,14 +60,18 @@ public class LngContractFactVo { * 关联类别(M-主合同/U-合同变更/C-确认函/A-补充协议/F-框架协议/R-续签合同/I-同一事项关联合同；以下不要：无/原合同补充协议/原合同续签合同/同一事项关联合同) */ @ApiModelProperty("关联类别(M-主合同/U-合同变更/C-确认函/A-补充协议/F-框架协议/R-续签合同/I-同一事项关联合同；以下不要：无/原合同补充协议/原合同续签合同/同一事项关联合同)") + @Trans(type = TransType.DIC, id = "2003815292742479874", transToFieldName = "relTypeName") private String relTypeCode; + private String relTypeName; /** * 合同类别(日常采购/工程建设/人力资源/投资管理/金融保险/租赁/信息管理/咨询服务/综合服务/生产运营/天然气公司业务合同) */ @ApiModelProperty("合同类别(日常采购/工程建设/人力资源/投资管理/金融保险/租赁/信息管理/咨询服务/综合服务/生产运营/天然气公司业务合同)") + @Trans(type = TransType.DIC, id = "2003815931950215169", transToFieldName = "kTypeName1") private String kTypeCode1; + private String kTypeName1; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurIntVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurIntVo.java index 6e80a72..2c2d3e3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurIntVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurIntVo.java @@ -7,7 +7,6 @@ import lombok.ToString; import lombok.experimental.Accessors; import java.math.BigDecimal; -import java.time.LocalDateTime; /** * @title: 表单出参 @@ -250,55 +249,7 @@ public class LngContractPurIntVo extends com.xjrsoft.common.model.base.BaseModel */ @ApiModelProperty("备注") private String note; - - - /** - * 创建人id - */ - @ApiModelProperty("创建人id") - private Long createUserId; - - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private LocalDateTime createDate; - - - /** - * 修改人id - */ - @ApiModelProperty("修改人id") - private Long modifyUserId; - - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - private LocalDateTime modifyDate; - - - /** - * 租户id - */ - @ApiModelProperty("租户id") - private Long tenantId; - - - /** - * 部门id - */ - @ApiModelProperty("部门id") - private Long deptId; - - - /** - * 数据权限id - */ - @ApiModelProperty("数据权限id") - private Long ruleUserId; + diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesIntVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesIntVo.java index 9d462f4..e487967 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesIntVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesIntVo.java @@ -9,7 +9,6 @@ import lombok.ToString; import lombok.experimental.Accessors; import java.math.BigDecimal; -import java.time.LocalDateTime; /** * @title: 表单出参 @@ -256,58 +255,4 @@ public class LngContractSalesIntVo extends com.xjrsoft.common.model.base.BaseMod */ @ApiModelProperty("备注") private String note; - - - /** - * 创建人id - */ - @ApiModelProperty("创建人id") - private Long createUserId; - - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private LocalDateTime createDate; - - - /** - * 修改人id - */ - @ApiModelProperty("修改人id") - private Long modifyUserId; - - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - private LocalDateTime modifyDate; - - - /** - * 租户id - */ - @ApiModelProperty("租户id") - private Long tenantId; - - - /** - * 部门id - */ - @ApiModelProperty("部门id") - private Long deptId; - - - /** - * 数据权限id - */ - @ApiModelProperty("数据权限id") - private Long ruleUserId; - - - - - } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurIntServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurIntServiceImpl.java index 1396747..94a97d8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurIntServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurIntServiceImpl.java @@ -42,6 +42,13 @@ public class ContractPurIntServiceImpl extends MPJBaseServiceImpl lngContractPurIntList = lngContractPurIntMapper.selectList( + new LambdaQueryWrapper() + .eq(LngContractPurInt::getKId, lngContract.getId())); + if (CollectionUtils.isNotEmpty(lngContractPurIntList)) { + vo.setLngContractPurIntList(BeanUtil.copyToList(lngContractPurIntList, + LngContractPurIntVo.class)); + } List lngContractFactRelList = lngContractFactRelMapper.selectList( new LambdaQueryWrapper() .eq(LngContractFactRel::getKId, lngContract.getId())); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesIntServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesIntServiceImpl.java index 6715d0c..f488e02 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesIntServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesIntServiceImpl.java @@ -49,7 +49,6 @@ public class ContractSalesIntServiceImpl extends MPJBaseServiceImpl lngContractFactRelList = lngContractFactRelMapper.selectList( new LambdaQueryWrapper() .eq(LngContractFactRel::getKId, lngContract.getId())); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml index ac06c3b..32a510c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml @@ -45,7 +45,7 @@ spring: group: DNE discovery: - ip: 10.0.0.2 + ip: 10.0.0.3 #network-interface: net7 xjrsoft: