From 780091f72391eb9e4c91cb509443753b10a73970 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 May 2023 13:59:43 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84-=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=88=86=E5=8F=91=20=E5=9B=9E=E6=98=BE=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...kingGroupDistributionRecordController.java | 8 ++++-- .../PayWorkingGroupSubItemContacts.java | 7 +++++ ...PayWorkingGroupSubItemContactsService.java | 3 ++ ...orkingGroupSubItemContactsServiceImpl.java | 28 +++++++++++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java index fa085bbd..2971e19c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java @@ -207,14 +207,16 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< } List listData = new ArrayList<>(); if(projectType == PayProjectCommon.PROJECT_TYPE_FILE1){ - LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId); - List list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + //LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + //queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId); + //List list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + List list = payWorkingGroupSubItemContactsService.getContactsInfo(projectId); if(!CollectionUtils.isEmpty(list)){ list.forEach(p->{ PayContactsManagement payContactsManagement = new PayContactsManagement(); payContactsManagement.setId(p.getContactsTemporaryId()); payContactsManagement.setName(p.getContactsTemporaryName()); + payContactsManagement.setCompanyName(p.getCompanyName()); listData.add(payContactsManagement); }); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java index 652c0846..2ea2065c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java @@ -121,4 +121,11 @@ public class PayWorkingGroupSubItemContacts implements Serializable { @ApiModelProperty(value = "企业联系人地址") @TableField(exist = false) private String contactAddress; + + /** + * 企业名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "企业名称") + private String companyName; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java index 4d63ad79..4a1f4277 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java @@ -3,6 +3,8 @@ package com.jero.project.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.project.entity.PayWorkingGroupSubItemContacts; +import java.util.List; + /** * @Description: pay_working_group_subitem_contacts * @Author: jeecg-boot @@ -11,4 +13,5 @@ import com.jero.project.entity.PayWorkingGroupSubItemContacts; */ public interface IPayWorkingGroupSubItemContactsService extends IService { + List getContactsInfo(String projectId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java index 07404cde..670c86c1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java @@ -1,11 +1,20 @@ package com.jero.project.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.mapper.PayWorkingGroupSubItemContactsMapper; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * @Description: pay_working_group_subitem_contacts @@ -15,5 +24,24 @@ import org.springframework.stereotype.Service; */ @Service public class PayWorkingGroupSubItemContactsServiceImpl extends ServiceImpl implements IPayWorkingGroupSubItemContactsService { + @Resource + private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; + @Override + public List getContactsInfo(String projectId){ + //1.获取成员信息 + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId); + List listPayWorkingGroupSubItemContacts = this.list(queryPayWorkingGroupSubItemContacts); + //2.根据成员id获取用户信息 + List temporaryIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + List contactsManagementTemporaryList = payContactsManagementTemporaryService.listByIds(temporaryIds); + Map collectMap = contactsManagementTemporaryList.stream().collect(Collectors.toMap(PayContactsManagementTemporary::getId, PayContactsManagementTemporary -> PayContactsManagementTemporary)); + for (PayWorkingGroupSubItemContacts subItemContacts : listPayWorkingGroupSubItemContacts) { + String contactsTemporaryId = subItemContacts.getContactsTemporaryId(); + PayContactsManagementTemporary payContactsManagementTemporary = collectMap.get(contactsTemporaryId); + subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName()); + } + return listPayWorkingGroupSubItemContacts; + } }