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