From d627e02dda9cc34a786807151135dcaefac4f84a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 29 Jul 2024 14:28:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087668=20=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E6=B2=A1=E6=9C=89=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6-=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=92=8C=E8=81=94=E7=B3=BB=E4=BA=BA=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E9=9A=8F=E4=B9=8B=E6=94=B9=E5=8A=A8=E5=90=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml    | 3 +--
 .../jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

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
         <where>
             pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId} AND (pdgs.check_result = 1 OR pdgs.check_result = 2)
             <if test="payDraftingGroupSubItem.chargeCompanyTemporaryName != null and payDraftingGroupSubItem.chargeCompanyTemporaryName != ''">
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,
-<!--            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,
             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
         <where>
             pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId}
             <if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''">