add：分标委列表负责人

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

@@ -26,6 +26,8 @@ import com.jero.data.service.IPayCaseCommitteeSubitemService;
 import com.jero.mail.commont.constant;
 import com.jero.meeting.entity.PayMeetingRemindRecord;
 import com.jero.meeting.service.IPayMeetingRemindRecordService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.util.AmountUtil;
 import io.swagger.annotations.Api;
@@ -47,6 +49,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 
 /**
@@ -71,8 +74,8 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 	private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
 	@Resource
 	private IPayCaseCommitteeService payCaseCommitteeService;
-
+	@Resource
-
+	private ISysUserService sysUserService;
 
 	/**
 	 * 分页列表查询
@@ -314,4 +317,22 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 		 return Result.OK("批量删除成功!");
 	 }
 
+
+	/**
+	 *  批量删除
+	 *
+	 */
+	@PostMapping(value = "/delWithOldData")
+	public Result<?> delWithOldData() {
+		List<PayCaseCommittee> list = payCaseCommitteeService.list();
+		List<PayCaseCommittee> collect = list.stream().map(payCaseCommittee -> {
+			String createById = payCaseCommittee.getCreateById();
+			SysUser sysUser = sysUserService.getById(createById);
+			payCaseCommittee.setPrincipalIdA(createById);
+			payCaseCommittee.setPrincipalNameA(sysUser.getRealname());
+			return payCaseCommittee;
+		}).collect(Collectors.toList());
+		payCaseCommitteeService.updateBatchById(collect);
+		return Result.OK("分标委旧数据处理成功!");
+	}
 }

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

@@ -24,6 +24,19 @@ public class FindByName implements Serializable {
     @ApiModelProperty(value = "负责人")
     private java.lang.String principal;
 
+    /**负责人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;
+
     @ApiModelProperty(value = "子目录分标委成员")
     private List<ChildrenFindByName> list;
 

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml

@@ -14,7 +14,7 @@
         </collection>
     </resultMap>
     <select id="listThree"  resultMap="people">
-        SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,#{companyName} as companyName,#{name} as tname
+        SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,principal_id_a as principalIdA,principal_name_a as  principalNameA,principal_id_b as principalIdB,principal_name_b as principalNameB,#{companyName} as companyName,#{name} as tname
         from
         pay_case_committee pe
         left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)