From fda6d8cab73fe311bc61a9e25828991166119d0d Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Tue, 16 Jan 2024 09:52:42 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=B7=BB=E5=8A=A0=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=8D=95=E4=BD=8D=E5=90=8E=EF=BC=8C=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF,=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?,=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4,=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4,=E5=85=B1=E8=AE=A1=E5=9B=9B=E4=B8=AA?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E5=90=8C=E6=A0=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayMemberProjectSubitemMapper.xml     | 12 +++++++++++-
 .../project/mapper/xml/PayCommonProjectMapper.xml    | 12 +++++++++++-
 .../mapper/xml/PayWorkingGroupSubItemMapper.xml      | 12 +++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
index 5a80d474..5fd3c5e3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
@@ -60,7 +60,17 @@
 
     <select id="getPage" resultMap="MemberProjectSubitemResultMap">
         select pmps.id,pmps.create_by,pmps.create_time,pmps.update_by,pmps.update_time,pmps.project_id,pmps.company_id,pmps.company_temporary_id,
-        if(pmps.company_name = pcm.company_name, pmps.company_name, concat(pmps.company_name,'（更名为',pcm.company_name,'）')) as company_name,
+#         if(pmps.company_name = pcm.company_name, pmps.company_name, concat(pmps.company_name,'（更名为',pcm.company_name,'）')) as company_name,
+        IF(
+        pmps.company_name =
+        IF(
+        pmps.company_name LIKE '%（未审核）',
+        CONCAT(pcm.company_name, '（未审核）'),
+        pcm.company_name
+        ),
+        pmps.company_name,
+        CONCAT(pmps.company_name, '（更名为', pcm.company_name, '）')
+        ) AS company_name,
         pmps.company_contact_id,pmps.company_contact_temporary_id,pmps.company_contact_name,pmps.post_contact_id,
         pmps.post_contact_temporary_id,
         pmps.post_contact_name,pmps.amount_receivable,pmps.paid_amount,pmps.confirm_amount,pmps.payment_method,pmps.charge_notice_no,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
index 332d6d4b..5aa2b668 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
@@ -11,7 +11,17 @@
             su.realname as principal_name,
             pcp.charge_company_id,
             pcp.charge_company_temporary_id,
-            if(pcp.charge_company_temporary_name = pcm.company_name, pcp.charge_company_temporary_name, concat(pcp.charge_company_temporary_name,'（更名为',pcm.company_name,'）')) as charge_company_temporary_name,
+#             if(pcp.charge_company_temporary_name = pcm.company_name, pcp.charge_company_temporary_name, concat(pcp.charge_company_temporary_name,'（更名为',pcm.company_name,'）')) as charge_company_temporary_name,
+            IF(
+            pcp.charge_company_temporary_name =
+            IF(
+            pcp.charge_company_temporary_name LIKE '%（未审核）',
+            CONCAT(pcm.company_name, '（未审核）'),
+            pcm.company_name
+            ),
+            pcp.charge_company_temporary_name,
+            CONCAT(pcp.charge_company_temporary_name, '（更名为', pcm.company_name, '）')
+            ) AS chargeCompanyTemporaryName,
             pcp.charge_use,
             pcp.contacts_id,
             pcp.contacts_temporary_id,
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 379dd6f4..4839cff4 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
@@ -9,7 +9,17 @@
             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,
+#             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,
+            IF(
+            pwgs.charge_company_temporary_name =
+            IF(
+            pwgs.charge_company_temporary_name LIKE '%（未审核）',
+            CONCAT(pcm.company_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,