Merge remote-tracking branch 'origin/dev' into dev

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.contract.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -181,4 +182,10 @@ public class AddLngContractFactDto implements Serializable {
     */
     @ApiModelProperty("lngContractApproRel子表")
     private List<AddLngContractApproRelDto> lngContractApproRelList;
+
+    /**
+     * lngFileUpload
+     */
+    @ApiModelProperty("lngFileUpload子表")
+    private List<UpdateLngFileUploadDto> lngFileUploadList;
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactDto.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.contract.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pictc.annotations.datalog.*;
+import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -258,4 +259,11 @@ public class UpdateLngContractFactDto implements Serializable {
     }, 
     caseType = JoinCaseType.FULL, target = UpdateLngContractApproRelDto.class, type = JoinType.MANY)
     private List<UpdateLngContractApproRelDto> lngContractApproRelList;
+
+    /**
+     * lngFileUpload
+     */
+    @ApiModelProperty("lngFileUpload子表")
+    @LogAttrField
+    private List<UpdateLngFileUploadDto> lngFileUploadList;
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngApproVo.java

@@ -80,14 +80,25 @@ public class LngApproVo {
     @ApiModelProperty("拟稿人(xjr_user.id)")
     @Trans(type = TransType.USER, transToFieldName = "empName")
     private Long empId;
-    
+
+    /**
+     * 拟稿人名称
+     */
+    @ApiModelProperty("拟稿人名称")
+    private String empName;
     
     /**
     * 业务部门(xjr_department.id)
     */
     @ApiModelProperty("业务部门(xjr_department.id)")
-    @Trans(type = TransType.DEPT, transToFieldName = "eDeptName")
+    @Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
     private Long bDeptId;
+
+    /**
+     * 业务部门名称
+     */
+    @ApiModelProperty("业务部门名称")
+    private String bDeptName;
     
     
     /**
@@ -96,8 +107,13 @@ public class LngApproVo {
     @ApiModelProperty("公司(xjr_department.id)")
     @Trans(type = TransType.DEPT, transToFieldName = "comName")
     private Long comId;
-    
-    
+
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty("公司名称")
+    private String comName;
+
     /**
     * 审批状态(未提交/审批中/已审批/已驳回)
     */

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngGradeSystemItemVo.java

@@ -51,6 +51,11 @@ public class LngGradeSystemItemVo {
     @Trans(type = TransType.DEPT_BY_CODE, transToFieldName = "eDeptName")
     private String eDeptCode;
 
+    /**
+     * 评价部门编码
+     */
+    @ApiModelProperty("评价部门编码")
+    private String eDeptName;
     
     /**
     * 显示顺序