From e50bd748e798da62ac5e3fcbb184eac7ba02d3bb Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Mon, 15 Jan 2024 12:00:53 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E8=B5=B7=E8=8D=89=E7=BB=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D-?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5-=E5=AF=BC=E5=85=A5=E5=90=8E=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A81--=E5=A4=87=E6=B3=A810=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayDraftingGroupSubItemServiceImpl.java   | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

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 d3ef3418..5098ed34 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
@@ -589,7 +589,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
                         msg.append("起草组不存在 ！");
                     }
                     if(StringUtils.isBlank(msg)) {
-                        // 获取工作组成员
+                        // 获取起草组成员
                         LambdaQueryWrapper<PayDraftingGroupSubItem> query = new LambdaQueryWrapper<>();
                         query.eq(PayDraftingGroupSubItem::getDraftingGroupId, draftGroupId);
                         List<PayDraftingGroupSubItem> listData = payDraftingGroupSubItemService.list(query);
@@ -610,7 +610,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
                                     p.setChargeCompanyId(listCompany.get(0).getId());
                                 }
                             }
-                            // 校验工作组成员单位是否已存在(是否重复)
+                            // 校验起草组成员单位是否已存在(是否重复)
                             if (!StringUtils.isBlank(p.getChargeCompanyId())) {
                                 List<PayDraftingGroupSubItem> listDateNew = listData.stream().filter(item -> Objects.equals(p.getChargeCompanyId(), item.getChargeCompanyId())).collect(Collectors.toList());
                                 if (!CollectionUtils.isEmpty(listDateNew)) {
@@ -638,6 +638,8 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
                             // 更新数据
                             payDraftingGroupSubItemService.saveBatch(list);
                             list.forEach(p->{
+                                // 处理联系人的备注字段
+                                List<String> remarks = dealRemarkField(p);
                                 String draftingGroupSubItemId = p.getId();
                                 List<PayDraftingGroupSubItemContacts> listPayDraftingGroupSubItemContacts = p.getPayDraftingGroupSubItemContactsList();
                                 if(!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContacts)){
@@ -645,6 +647,8 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
                                         listPayDraftingGroupSubItemContacts.get(i).setDraftingGroupId(p.getDraftingGroupId());
                                         listPayDraftingGroupSubItemContacts.get(i).setDraftingGroupSubId(draftingGroupSubItemId);
                                         listPayDraftingGroupSubItemContacts.get(i).setOrderNum(i + 1);
+                                        listPayDraftingGroupSubItemContacts.get(i).setRemarks(remarks.get(i));
+
                                     }
                                     payDraftingGroupSubItemContactsService.saveBatch(listPayDraftingGroupSubItemContacts);
                                 }
@@ -668,6 +672,22 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
         }
     }
 
+    // 处理联系人的remark字段
+    public List<String> dealRemarkField(PayDraftingGroupSubItem p) {
+        ArrayList<String> arrayList = new ArrayList<>();
+        arrayList.add(p.getRemarksOne());
+        arrayList.add(p.getRemarksTwo());
+        arrayList.add(p.getRemarksThree());
+        arrayList.add(p.getRemarksFour());
+        arrayList.add(p.getRemarksFive());
+        arrayList.add(p.getRemarksSix());
+        arrayList.add(p.getRemarksSeven());
+        arrayList.add(p.getRemarksEight());
+        arrayList.add(p.getRemarksNine());
+        arrayList.add(p.getRemarksTen());
+        return arrayList;
+    }
+
     /**
      * 验证重复
      * @param p