From a9fb85381decbea11154d69defd5e2e1f5f60106 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Thu, 16 Dec 2021 10:06:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayIncomeContractMapper.xml    | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
index 22f7c19a..1d17f40c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
@@ -201,8 +201,33 @@
         ORDER BY createTime DESC,projectId DESC
     </select>
     <select id="queryCompanyPageList" resultType="com.jero.contract.entity.PayIncomeContract">
-        select pic.*,pmc.post_status as postStatus from pay_income_contract pic
+        select
+            pic.*,
+            pmc.post_status as postStatus,
+            GROUP_CONCAT(project.projectName ORDER BY project.id DESC) AS associatedProject
+        from pay_income_contract pic
+        LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id
         left join pay_mail_contract pmc ON pic.id = pmc.contract_id
+        LEFT JOIN
+        (
+            SELECT id,charge_project AS projectName FROM pay_common_project
+            UNION ALL
+            SELECT pwgs.id,pwg.working_group_project AS projectName FROM pay_working_group_subitem pwgs
+            LEFT JOIN pay_working_group pwg ON pwg.id = pwgs.working_group_id
+            WHERE pwg.working_group_project IS NOT NULL AND pwg.working_group_project != ''
+            UNION ALL
+            SELECT sit.id,meeting.meeting_name AS projectName FROM pay_meeting meeting
+            INNER JOIN pay_meeting_situation sit ON meeting.id = sit.meeting_id
+            WHERE meeting.meeting_name IS NOT NULL AND meeting.meeting_name != ''
+            UNION ALL
+            SELECT msub.id,pmp.project_name AS projectName FROM pay_member_project pmp
+            INNER JOIN pay_member_project_subitem msub ON pmp.id = msub.project_id
+            WHERE pmp.project_name IS NOT NULL AND pmp.project_name != ''
+            UNION ALL
+            SELECT tmsub.id,tmember.project_name AS projectName FROM tb_member_project tmember
+            INNER JOIN tb_member_project_subitem tmsub ON tmember.id=tmsub.project_id
+            where tmember.project_name IS NOT NULL AND tmember.project_name != ''
+        ) project ON project.id = pica.project_id
         <where> signed_contacts_id = #{payIncomeContract.signedContactsId}
             <if test="payIncomeContract.contractName != null and payIncomeContract.contractName != ''">
                 AND (pic.contract_name LIKE concat('%',concat(#{payIncomeContract.contractName},'%'))