From 3642ed0bd5f6578cdd2bc8c8ba808405ac35bc17 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Thu, 11 Jan 2024 14:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E7=BB=84=E5=88=97=E8=A1=A8,=E8=8E=B7=E5=8F=96=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayDraftingGroupSubItemController.java | 11 +++++++++++
 .../impl/PayDraftingGroupSubItemServiceImpl.java      |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
index e2840b93..fa03d042 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
@@ -191,7 +191,18 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
             querySysUser.in(SysUser::getId,listString);
             List<SysUser> listSysUser = sysUserService.list(querySysUser);
 
+            // 获取企业联系人
+            List<String> subItemIds = list.stream().map(PayDraftingGroupSubItem::getId).collect(Collectors.toList());
+            LambdaQueryWrapper<PayDraftingGroupSubItemContacts> queryDraftingGroupSubItemContacts = new LambdaQueryWrapper<>();
+            queryDraftingGroupSubItemContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, subItemIds);
+            List<PayDraftingGroupSubItemContacts> payDraftingGroupSubItemContactsList = payDraftingGroupSubItemContactsService.list(queryDraftingGroupSubItemContacts);
             list.forEach(p->{
+                if (!CollectionUtils.isEmpty(payDraftingGroupSubItemContactsList)) {
+                    List<PayDraftingGroupSubItemContacts> payDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsList
+                            .stream().filter(item -> Objects.equals(item.getDraftingGroupSubId(), p.getId())).collect(Collectors.toList());
+                    p.setPayDraftingGroupSubItemContactsList(payDraftingGroupSubItemContacts);
+                }
+
                 List<PayDraftingGroup> listPrincipalIdA = listPayDraftingGroup.stream().filter(item->Objects.equals(item.getId(),p.getDraftingGroupId())).collect(Collectors.toList());
                 if(!CollectionUtils.isEmpty(listPrincipalIdA)){
                     if(!CollectionUtils.isEmpty(listSysUser)){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
index edb0f73d..d4cbd7d0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
@@ -179,7 +179,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
         }
 
         JSONObject json = new JSONObject();
-        json.put("type",ProjectCommon.PROJECT_TYPE2);
+        json.put("type",ProjectCommon.PROJECT_TYPE7);
         json.put("draftGroupId",payDraftingGroupSubItem.getDraftingGroupId());
         json.put("projectId",payDraftingGroupSubItem.getId());
         json.put("path","/draftTeam/DraftTeamDetail");