diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index d61e7cb6..3082c9c2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/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 delWithOldData() { + List list = payCaseCommitteeService.list(); + List 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("分标委旧数据处理成功!"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java index 02efaa5b..5a57e8a6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java +++ b/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 list; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index ac43aa21..e2607664 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -14,7 +14,7 @@