From 59732ac38bf4b7dfd778a845fbc8f524447fc6ad Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 27 Dec 2023 15:53:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=94=B9=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=97=B6=E5=A4=84=E7=90=86=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=EF=BC=88=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/mapper/xml/PayWorkingGroupSubItemMapper.xml    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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,
+<!--            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
         <where>
             pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId}
             <if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''">
-                AND pwgs.charge_company_temporary_name LIKE
+                AND pcm.company_name LIKE
                 concat('%',concat(#{payWorkingGroupSubItem.chargeCompanyTemporaryName},'%'))
             </if>
             <if test="paymentDate != null and paymentDate != ''">