From 8564e3a5236fada55d3cc2f0d1dc00229149ac5a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Jul 2024 09:52:57 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98=E5=AF=BC=E5=85=A5=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SafetyCenterSubitemService.java   | 42 +++++++++++++++++--
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
index 350c4c07..2ce912df 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
@@ -309,9 +309,7 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
             SafetyCenterSubitemImport subitemImport = (SafetyCenterSubitemImport) obj;
             String companyName = subitemImport.getCompanyName();
             List<SafetyCenterSubitemContactsImport> contactsList = subitemImport.getContactsList();
-            if (errorRowNum != 4){
-                errorRowNum += contactsList.size() -1;
-            }
+
             PayCompanyManagement company = null;
             if (StringUtils.isBlank(companyName)){
                 errorMessage.add("第" + errorRowNum + "行：成员单位不能为空");
@@ -332,6 +330,35 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
                 }
             }
             String companyId = company.getId();
+            LambdaQueryWrapper<SafetyCenterSubitem> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SafetyCenterSubitem::getProjectId,projectId);
+            wrapper.eq(SafetyCenterSubitem::getCompanyId,companyId);
+            if (this.count(wrapper) > 0){
+                errorMessage.add("第" + errorRowNum + "行：成员单位当前项目中已经存在");
+                errorRowNum2 += contactsList.size();
+                continue;
+            }
+
+            Integer projectType = safetyCenter.getProjectType();
+            List<String> parentContactIdList = new ArrayList<>();
+            if (SafetyCenterCommon.PROJECT_TYPE_1 != projectType) {
+                //判断企业
+                String parentId = safetyCenter.getParentId();
+                LambdaQueryWrapper<SafetyCenterSubitem> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(SafetyCenterSubitem::getProjectId, parentId);
+                wrapper1.eq(SafetyCenterSubitem::getCompanyId, companyId);
+                SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper1);
+                if (parentCenterSubitem == null) {
+                    errorMessage.add("第" + errorRowNum + "行：成员单位不是当前项目成员");
+                    errorRowNum2 += contactsList.size();
+                    continue;
+                }
+                String parentCenterSubitemId = parentCenterSubitem.getId();
+                List<SafetyCenterSubitemContacts> parentContactList = contactsService.listBySubitemId(parentCenterSubitemId);
+                parentContactIdList = parentContactList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList());
+            }
+            errorRowNum += contactsList.size() -1;
+
             List<String> distinctContactsList = new ArrayList<>();
             List<SafetyCenterSubitemContacts> subitemContactsList = new ArrayList<>();
             for (SafetyCenterSubitemContactsImport contactsImport : contactsList) {
@@ -347,11 +374,18 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
                     continue;
                 }
                 if (distinctContactsList.contains(contacts)){
-                    errorMessage.add("第" + errorRowNum + "行：企业联系人重复");
+                    errorMessage.add("第" + errorRowNum2 + "行：企业联系人重复");
                     continue;
                 }else {
                     distinctContactsList.add(contacts);
                 }
+                if (SafetyCenterCommon.PROJECT_TYPE_1 != projectType) {
+                    //判断联系人
+                    if (!parentContactIdList.contains(payContactsManagement.getId())){
+                        errorMessage.add("第" + errorRowNum2 + "行：企业联系人不是当前项目成员");
+                        continue;
+                    }
+                }
                 SafetyCenterSubitemContacts contacts1 = new SafetyCenterSubitemContacts();
                 contacts1.setContactsId(payContactsManagement.getId());
                 contacts1.setRemarks(contactsImport.getRemarks());