add：统计打包变更

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java

@@ -25,7 +25,10 @@ import com.jero.data.service.IPayCaseCommitteeService;
 import com.jero.data.service.IPayCaseCommitteeSubitemService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -63,6 +66,9 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 	 @Autowired
 	 private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
 
+	 @Resource
+	 private ISysUserService sysUserService;
+
 	/**
 	 * 分标委表-企业端分页列表查询
 	 *
@@ -170,6 +176,16 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 		BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee);
 		LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 		payCaseCommittee.setCreateById(sysUser.getId());
+		String principalIdA = payCaseCommittee.getPrincipalIdA();
+		String principalIdB = payCaseCommittee.getPrincipalIdB();
+		if(StringUtils.isNotBlank(principalIdA)){
+			SysUser byId = sysUserService.getById(principalIdA);
+			payCaseCommittee.setPrincipalNameA(byId.getRealname());
+		}
+		if(StringUtils.isNotBlank(principalIdB)){
+			SysUser byId = sysUserService.getById(principalIdB);
+			payCaseCommittee.setPrincipalNameB(byId.getRealname());
+		}
 		payCaseCommitteeService.save(payCaseCommittee);
 		return Result.OK("添加成功！");
 	}
@@ -202,6 +218,18 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 		}
 		PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
 		BeanUtils.copyProperties(payCaseCommitteeUpdateDTO, payCaseCommittee);
+		String principalIdA = payCaseCommittee.getPrincipalIdA();
+		String principalIdB = payCaseCommittee.getPrincipalIdB();
+		if(StringUtils.isNotBlank(principalIdA)){
+			SysUser byId = sysUserService.getById(principalIdA);
+			payCaseCommittee.setPrincipalNameA(byId.getRealname());
+		}
+		if(StringUtils.isNotBlank(principalIdB)){
+			SysUser byId = sysUserService.getById(principalIdB);
+			payCaseCommittee.setPrincipalNameB(byId.getRealname());
+		}else {
+			payCaseCommittee.setPrincipalNameB(null);
+		}
 		payCaseCommitteeService.updateById(payCaseCommittee);
 		return Result.OK("编辑成功！");
 	}

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeUpdateDTO.java

@@ -3,6 +3,7 @@ package com.jero.data.entity.DTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -28,4 +29,17 @@ public class PayCaseCommitteeUpdateDTO {
     @Size(max = 200,message = "目标简述长度不得超过200")
     @ApiModelProperty(value = "目标简述")
     private java.lang.String remarks;
+
+    /**负责人Aid*/
+    @ApiModelProperty(value = "负责人Aid")
+    private String principalIdA;
+    /**负责人名称A*/
+    @ApiModelProperty(value = "负责人名称A")
+    private String principalNameA;
+    /**负责人Bid*/
+    @ApiModelProperty(value = "负责人Bid")
+    private String principalIdB;
+    /**负责人名称B*/
+    @ApiModelProperty(value = "负责人名称B")
+    private String principalNameB;
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java

@@ -1,9 +1,8 @@
 package com.jero.data.entity;
 
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -70,9 +69,11 @@ public class PayCaseCommittee implements Serializable {
     @ApiModelProperty(value = "负责人名称A")
     private String principalNameA;
     /**负责人Bid*/
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     @ApiModelProperty(value = "负责人Bid")
     private String principalIdB;
     /**负责人名称B*/
+    @TableField(updateStrategy= FieldStrategy.IGNORED)
     @Excel(name = "负责人名称B", width = 15)
     @ApiModelProperty(value = "负责人名称B")
     private String principalNameB;

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java

@@ -346,7 +346,7 @@ public class PayMeeting implements Serializable {
     /**是否需要问题征集*/
     @Dict(dicCode = "yn")
     @Excel(name = "是否征集问题", width = 20,dicCode ="yn")
-    @ApiModelProperty(value = "是否需要问题征集")
+    @ApiModelProperty(value = "是否需要问题征集（0：否，1：是）")
     private String isAddQuestion;
 
     /**征集问题text*/