LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/branch20241月中旬'

Browse Source
This commit is contained in:
lijiarao
2024-01-19 18:12:03 +08:00
parent 9995049ab6 4b3f0077d7
commit 3eba826ba0
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
+10 -7
View File
@@ -25,6 +25,10 @@
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,11 +36,6 @@
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>
@@ -49,8 +48,12 @@
<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 (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 pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%')