From 421d30f43012fb1951a58ee48d3435146285f659 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 22 Mar 2024 17:29:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082964=20=E6=89=93=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E7=82=B9=E5=87=BB=E9=A1=B9=E7=9B=AE--=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=89=93=E5=8C=85--=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE--=E4=BC=81=E4=B8=9A=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayPackCompanyProjectMapper.xml    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
index 9903a444..4f0be3d3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
@@ -111,13 +111,14 @@
             </where>
             <!-- 标协会员项目-->
             UNION ALL
-            select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,tmember.director_id, su.realname,'',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,
-            tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,affirm_income
+            select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,tmember.director_id, su.realname,'',pcm.name as contacts_temporary_name,tmsub.company_name,tmsub.amount_receivable,
+            tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,pcm.phone,pcm.email,affirm_income
             ,null as mail_contacts_id,null as mail_contacts_temporary_id,null as mail_contacts_temporary_name
             from tb_member_project tmember
             left join sys_user su on tmember.director_id = su.id
             inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
-            <where>
+            LEFT JOIN pay_contacts_management pcm ON tmsub.liaison_man_id = pcm.id
+        <where>
                 <if test="companyId != null and companyId != ''">
                     AND tmsub.company_id = #{companyId}
                 </if>
@@ -164,7 +165,8 @@
     <select id="queryPackListAll" resultType="com.jero.project.entity.PayCommonProject">
         SELECT * FROM (
         <!-- 普通项目-->
-        select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,c.contacts_temporary_name,c.affirm_income
+        select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,c.contacts_temporary_name
+        ,c.affirm_income
         from pay_common_project c
         left join sys_user su on c.principal_id = su.id
         <where>
@@ -272,11 +274,12 @@
         </where>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id, su.realname,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.liaison_man
-        ,tmsub.affirm_income
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id, su.realname,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5
+        ,pcm.name as contacts_temporary_name,tmsub.affirm_income
         from tb_member_project tmember
         left join sys_user su on tmember.director_id = su.id
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
+        LEFT JOIN pay_contacts_management pcm ON tmsub.liaison_man_id = pcm.id
         <where>
             <if test="projectId != null and projectId != ''">
                 AND tmsub.id = #{projectId}