From 38b16159952b11017a69e7eac01b55286d32aada Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 31 Jul 2024 13:52:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087830=20=E5=B9=B4=E5=BA=A6=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=BB=B4=E6=8A=A4-=E4=BC=9A=E5=91=98=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF-=E6=9C=AA=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BC=81=E4=B8=9A=E5=8D=95=E4=BD=8D=E5=81=9A=E4=BA=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=97=E8=A1=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=9C=80=E6=96=B0=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/TbMemberProjectSubitemMapper.xml      | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
index b586385a..e687f393 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
@@ -70,6 +70,7 @@
         <result column="invalidation_date" property="invalidationDate"/>
         <result column="year" property="year"/>
     </resultMap>
+
     <select id="queryListByCompany" resultType="com.jero.member.entity.TbMemberProjectSubitem">
         SELECT tmps.*,tmp.project_name,#{projectType} AS projectType FROM tb_member_project_subitem tmps
         LEFT JOIN tb_member_project tmp ON tmps.project_id = tmp.id
@@ -87,10 +88,37 @@
         GROUP BY tmps.id ORDER BY tmps.create_time DESC
     </select>
 
-    <select id="pageList" resultMap="TbMemberProjectSubitemResultMap">
-        select distinct tmps.*
+    <select id="pageList" resultType="com.jero.member.entity.TbMemberProjectSubitem">
+        select tmps.id,tmps.create_by,tmps.create_time,tmps.update_by,tmps.update_time,tmps.project_id,tmps.member_no,
+        tmps.company_id,
+        tmps.company_temporary_id,
+        ifnull( IF(
+        tmps.company_name =
+        IF(
+        tmps.company_name LIKE '%（未审核）',
+        CONCAT(pcm.company_name, '（未审核）'),
+        pcm.company_name
+        ),
+        tmps.company_name,
+        CONCAT(tmps.company_name, '（更名为', pcm.company_name, '）')
+        ), tmps.company_name) AS company_name,
+        tmps.member_nature,
+        tmps.member_type,tmps.liaison_man_id,tmps.company_contact_temporary_id,
+        tmps.liaison_man,tmps.post_company_id,tmps.post_contact_id,tmps.post_contact_temporary_id,tmps.email,tmps.mobile,
+        tmps.member_status,tmps.register_time,tmps.amount_receivable,tmps.tax_rate,
+        tmps.tax,tmps.no_tax_amount,tmps.paid_amount,tmps.confirm_amount,tmps.estimated_arrival_date,
+        tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.affirm_income,
+        tmps.mail,tmps.ticket_collection,tmps.charge_use,tmps.payment_method,tmps.tb_payment_id,tmps.invoice_amount,
+        tmps.payment_status,tmps.bill_number,tmps.member_id,tmps.payment_record,
+        tmps.submission_time,tmps.header_name,tmps.tax_number,tmps.invoice_address,tmps.invoice_phone,tmps.deposit_bank,
+        tmps.bank_account,tmps.link_bank_number,tmps.confirm_tax,tmps.confirm_no_tax_amount,tmps.paid_tax,tmps.paid_no_tax_amount,
+        tmps.invoice_tax,tmps.invoice_no_tax_amount,tmps.member_payment_amount,tmps.certificate_payment_amount,tmps.other_payment_amount,
+        tmps.admin_add_flag,tmps.charge_notice_no,tmps.charge_notice_id,tmps.contract_num,tmps.remark,tmps.effective_date,
+        tmps.invalidation_date
+
         from tb_member_project_subitem tmps
             LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id
+            left join pay_company_management pcm on tmps.company_id = pcm.id
         ${ew.customSqlSegment}
     </select>