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 e31b55a5..97856f8e 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,7 +8,8 @@ pwgs.working_group_id AS workingGroupId, pwgs.charge_company_id AS chargeCompanyId, pwgs.charge_company_temporary_id AS chargeCompanyTemporaryId, - pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName, + + 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, pwgs.contacts_id_one AS contactsIdOne, pwgs.contacts_temporary_id_one AS contactsTemporaryIdOne, pwgs.contacts_temporary_name_one AS contactsTemporaryNameOne, @@ -48,10 +49,12 @@ pwgs.estimated_arrival_date 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 pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId} - AND pwgs.charge_company_temporary_name LIKE + AND pcm.company_name LIKE concat('%',concat(#{payWorkingGroupSubItem.chargeCompanyTemporaryName},'%'))