diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml index 8e8c8a91..2fb374f9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml @@ -35,8 +35,7 @@ pdgs.create_time AS createTime, pdgs.update_by AS updateBy FROM pay_drafting_group_subitem pdgs - left join pay_company_management_temporary pcmt on pdgs.charge_company_temporary_id = pcmt.id - left join pay_company_management pcm on pcmt.company_id = pcm.id + left join pay_company_management pcm on pdgs.charge_company_id = pcm.id pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId} AND (pdgs.check_result = 1 OR pdgs.check_result = 2) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 52b0aa5b..deeb4c06 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -8,8 +8,6 @@ pwgs.working_group_id AS workingGroupId, pwgs.charge_company_id AS chargeCompanyId, pwgs.charge_company_temporary_id AS chargeCompanyTemporaryId, - -# if(pwgs.charge_company_temporary_name = pcm.company_name, pwgs.charge_company_temporary_name, concat(pwgs.charge_company_temporary_name,'(更名为',pcm.company_name,')')) as chargeCompanyTemporaryName, ifnull( IF( pwgs.charge_company_temporary_name = IF( @@ -62,8 +60,7 @@ pwgs.confirm_voucher FROM pay_working_group_subitem pwgs LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id - left join pay_company_management_temporary pcmt on pwgs.charge_company_temporary_id = pcmt.id - left join pay_company_management pcm on pcmt.company_id = pcm.id + left join pay_company_management pcm on pwgs.charge_company_id = pcm.id pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId}