From 53b6c8fa899000ae175ec57592b975cb0a8a63ca Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Fri, 12 Jan 2024 17:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=AA=8C=E8=AF=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AE=A1=E6=A0=B8=E8=A2=AB=E6=8B=92=E7=BB=9D=E7=9A=84?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayDraftingGroupMapper.xml     |  8 ++---
 .../impl/PayDraftingGroupServiceImpl.java     | 35 +++++++++++++------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
index 16d4d12c..c0576888 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
@@ -33,10 +33,10 @@
         </if>
         <where>
             <!-- 动态条件 -->
-            <if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')
-                or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">
-                AND pdgs.check_result != 3
-            </if>
+<!--            <if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')-->
+<!--                or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">-->
+<!--                AND pdgs.check_result != 3-->
+<!--            </if>-->
             <if test="payDraftingGroup.draftingGroupProject != null and payDraftingGroup.draftingGroupProject != ''">
                 AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
             </if>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
index c19e818a..1f8f5351 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
@@ -158,13 +158,20 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
         query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id);
         List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
         if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
-            for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) {
-                if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
-                    throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!");
-                }
-            }
+            throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!");
         }
 
+//        LambdaQueryWrapper<PayDraftingGroupSubItem> query = new LambdaQueryWrapper<>();
+//        query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id);
+//        List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
+//        if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
+//            for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) {
+//                if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
+//                    throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!");
+//                }
+//            }
+//        }
+
         LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
         meetingQuery.eq(PayMeeting::getDraftingGroupId,id);
         meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT);
@@ -206,13 +213,19 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
             query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p);
             List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
             if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
-                for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) {
-                    if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
-                        sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
-                        break;
-                    }
-                }
+                sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
             }
+//            LambdaQueryWrapper<PayDraftingGroupSubItem> query = new LambdaQueryWrapper<>();
+//            query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p);
+//            List<PayDraftingGroupSubItem> listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query);
+//            if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) {
+//                for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) {
+//                    if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) {
+//                        sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！<br/>");
+//                        break;
+//                    }
+//                }
+//            }
             LambdaQueryWrapper<PayMeeting> meetingQuery = new LambdaQueryWrapper<>();
             meetingQuery.eq(PayMeeting::getDraftingGroupId,p);
             meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT);