From 46d2f681f8fbc4e2c8f78155ff8d1cc0609bd37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 19 Jan 2024 12:00:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=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 + + left join pay_meeting pm on pdg.id = pm.drafting_group_id + left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id + @@ -32,31 +35,27 @@ left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id - - - - - AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%')) - AND pdg.principal_id_a = #{payDraftingGroup.principalIdA} + AND principal_id_a = #{payDraftingGroup.principalIdA} - AND pdg.year = #{payDraftingGroup.year} + AND year = #{payDraftingGroup.year} - - AND working_group_id = #{payDraftingGroup.workingGroupId} - - - AND pwg.working_group_project like concat('%', #{payDraftingGroup.workingGroupName}, '%') + + 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} + ) - and pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%') + and pwgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%') - and pdgs.charge_company_temporary_name like concat('%', #{payDraftingGroup.companyName}, '%') + and pwgs.charge_company_temporary_name like concat('%', #{payDraftingGroup.companyName}, '%') ORDER BY pdg.create_time DESC From 4b3f0077d7fcd4f664d2766078f374d33c40966c Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 19 Jan 2024 14:29:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E5=85=B6=E4=BB=96=E4=BA=BA?= =?UTF-8?q?=E8=B5=B7=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 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},'%')) - AND principal_id_a = #{payDraftingGroup.principalIdA} + AND pdg.principal_id_a = #{payDraftingGroup.principalIdA} - AND year = #{payDraftingGroup.year} + AND pdg.year = #{payDraftingGroup.year} + + + AND working_group_id = #{payDraftingGroup.workingGroupId} - 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} ) - and pwgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%') + and pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%') - and pwgs.charge_company_temporary_name like concat('%', #{payDraftingGroup.companyName}, '%') + and pdgs.charge_company_temporary_name like concat('%', #{payDraftingGroup.companyName}, '%') ORDER BY pdg.create_time DESC