From 46d2f681f8fbc4e2c8f78155ff8d1cc0609bd37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 19 Jan 2024 12:00:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=B7=E8=8D=89=E7=BB=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayDraftingGroupMapper.xml     | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 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 c0576888..df699061 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
@@ -20,11 +20,14 @@
         pdg.update_time AS updateTime,
         su.realname AS principalNameA,
         su1.realname AS principalNameB,
-        pwg.working_group_project AS workingGroupName
+        pdg.drafting_group_project AS workingGroupName
         FROM pay_drafting_group pdg
         left join sys_user su on pdg.principal_id_a = su.id
         left join sys_user su1 on pdg.principal_id_b = su1.id
-        left join pay_working_group pwg on pwg.id = pdg.working_group_id
+        <if test="payDraftingGroup.principalA != null and payDraftingGroup.principalA != '' and payDraftingGroup.principalB != null and payDraftingGroup.principalB != ''">
+            left join pay_meeting pm on pdg.id = pm.drafting_group_id
+            left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id
+        </if>
         <!-- 动态添加表连接 -->
         <if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')
             or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">
@@ -32,31 +35,27 @@
             left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id
         </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.draftingGroupProject != null and payDraftingGroup.draftingGroupProject != ''">
                 AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
             </if>
             <if test="payDraftingGroup.principalIdA != null and payDraftingGroup.principalIdA != ''">
-                AND pdg.principal_id_a = #{payDraftingGroup.principalIdA}
+                AND principal_id_a = #{payDraftingGroup.principalIdA}
             </if>
             <if test="payDraftingGroup.year != null and payDraftingGroup.year != ''">
-                AND pdg.year = #{payDraftingGroup.year}
+                AND year = #{payDraftingGroup.year}
             </if>
-            <if test="payDraftingGroup.workingGroupId != null and payDraftingGroup.workingGroupId != ''">
-                AND working_group_id = #{payDraftingGroup.workingGroupId}
-            </if>
-            <if test="payDraftingGroup.workingGroupName != null and payDraftingGroup.workingGroupName != ''">
-                AND pwg.working_group_project  like concat('%', #{payDraftingGroup.workingGroupName}, '%')
+            <if test="payDraftingGroup.principalA != null and payDraftingGroup.principalA != '' and payDraftingGroup.principalB != null and payDraftingGroup.principalB != ''">
+                AND (principal_id_a = #{payDraftingGroup.principalA}
+                OR principal_id_b = #{payDraftingGroup.principalB}
+                OR pm.director_id = #{payDraftingGroup.principalA}
+                OR pmc.meeting_contacts_id = #{payDraftingGroup.principalA}
+                )
             </if>
             <if test="payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != ''">
-                and pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%')
+                and pwgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%')
             </if>
             <if test="payDraftingGroup.companyName != null and payDraftingGroup.companyName != ''">
-                and pdgs.charge_company_temporary_name like concat('%', #{payDraftingGroup.companyName}, '%')
+                and pwgs.charge_company_temporary_name like concat('%', #{payDraftingGroup.companyName}, '%')
             </if>
         </where>
         ORDER BY pdg.create_time DESC