From 4b3f0077d7fcd4f664d2766078f374d33c40966c Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Fri, 19 Jan 2024 14:29:09 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=94=A8=E6=88=B7=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=9C=8B=E5=88=B0=E5=85=B6=E4=BB=96=E4=BA=BA=E8=B5=B7?=
 =?UTF-8?q?=E8=8D=89=E7=BB=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayDraftingGroupMapper.xml      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 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 df699061..8f89325e 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,10 +20,11 @@
         pdg.update_time AS updateTime,
         su.realname AS principalNameA,
         su1.realname AS principalNameB,
-        pdg.drafting_group_project AS workingGroupName
+        pwg.working_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
@@ -39,23 +40,26 @@
                 AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
             </if>
             <if test="payDraftingGroup.principalIdA != null and payDraftingGroup.principalIdA != ''">
-                AND principal_id_a = #{payDraftingGroup.principalIdA}
+                AND pdg.principal_id_a = #{payDraftingGroup.principalIdA}
             </if>
             <if test="payDraftingGroup.year != null and payDraftingGroup.year != ''">
-                AND year = #{payDraftingGroup.year}
+                AND pdg.year = #{payDraftingGroup.year}
+            </if>
+            <if test="payDraftingGroup.workingGroupId != null and payDraftingGroup.workingGroupId != ''">
+                AND working_group_id = #{payDraftingGroup.workingGroupId}
             </if>
             <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}
+                AND (pdg.principal_id_a = #{payDraftingGroup.principalA}
+                OR pdg.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 pwgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%')
+                and pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%')
             </if>
             <if test="payDraftingGroup.companyName != null and payDraftingGroup.companyName != ''">
-                and pwgs.charge_company_temporary_name like concat('%', #{payDraftingGroup.companyName}, '%')
+                and pdgs.charge_company_temporary_name like concat('%', #{payDraftingGroup.companyName}, '%')
             </if>
         </where>
         ORDER BY pdg.create_time DESC