修改

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;
 
 }

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;
 
 }

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;
 
@@ -170,14 +171,6 @@ public class UpdateLngContractPIDto implements Serializable {
     @ApiModelProperty("备注")
     private String note;
 
-    /**
-    * 租户id
-    */
-    @LogField(name="租户id",index=21)
-    @ApiModelProperty("租户id")
-    private Long tenantId;
-    
-
     /**
     * lngContractPurInt
     */

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;
 
@@ -170,14 +171,6 @@ public class UpdateLngContractSIDto implements Serializable {
     @ApiModelProperty("备注")
     private String note;
 
-    /**
-    * 租户id
-    */
-    @LogField(name="租户id",index=21)
-    @ApiModelProperty("租户id")
-    private Long tenantId;
-    
-
     /**
     * lngContractSalesInt
     */

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;
     
     
     /**

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: 表单出参
@@ -252,54 +251,6 @@ public class LngContractPurIntVo extends com.xjrsoft.common.model.base.BaseModel
     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;
-    
     
 
 

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;
-
-
-
-
-
 }

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<LngContractMap
             throw new BusinessException(BusinessCode.of(10500,"找不到此数据"));
         }
         LngContractPIVo vo = BeanUtil.toBean(lngContract, LngContractPIVo.class);
+        List<LngContractPurInt> lngContractPurIntList = lngContractPurIntMapper.selectList(
+                new LambdaQueryWrapper<LngContractPurInt>()
+                        .eq(LngContractPurInt::getKId, lngContract.getId()));
+        if (CollectionUtils.isNotEmpty(lngContractPurIntList)) {
+            vo.setLngContractPurIntList(BeanUtil.copyToList(lngContractPurIntList,
+                    LngContractPurIntVo.class));
+        }
         List<LngContractFactRel> lngContractFactRelList = lngContractFactRelMapper.selectList(
                 new LambdaQueryWrapper<LngContractFactRel>()
                         .eq(LngContractFactRel::getKId, lngContract.getId()));

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<LngContractM
             vo.setLngContractSalesIntList(BeanUtil.copyToList(lngContractSalesIntList,
                     LngContractSalesIntVo.class));
         }
-
         List<LngContractFactRel> lngContractFactRelList = lngContractFactRelMapper.selectList(
                 new LambdaQueryWrapper<LngContractFactRel>()
                         .eq(LngContractFactRel::getKId, lngContract.getId()));

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: