From 8ec6030f176f7e1bd0e49f942223d2e385b598bc Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 20 Aug 2024 15:35:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=89=93=E5=8C=85=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=AA=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE=E6=97=B6=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/PayPackCompanyProjectMapper.xml       | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 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 ca99ebe3..4494b004 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
@@ -185,7 +185,7 @@
         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
+        ,c.affirm_income, null as sort_no
         from pay_common_project c
         left join sys_user su on c.principal_id = su.id
         <where>
@@ -211,7 +211,7 @@
         <!--工作组项目-->
         UNION ALL
         select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,gsubc.contacts_temporary_name as contacts_temporary_name_one
-        ,gsub.affirm_income
+        ,gsub.affirm_income, g.sort_no as sort_no
         from pay_working_group g
         left join sys_user su on g.principal_id_a = su.id
         inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
@@ -239,7 +239,7 @@
         <!-- 会议项目-->
         UNION ALL
         select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.company_contact_name
-        ,sit.affirm_income
+        ,sit.affirm_income, null as sort_no
         from pay_meeting meeting
         left join sys_user su on meeting.director_id = su.id
         inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
@@ -267,7 +267,7 @@
         <!-- 会员项目-->
         UNION ALL
         select msub.id,pmp.project_name,msub.charge_use,pmp.director_id, su.realname,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,msub.company_contact_name
-        ,msub.affirm_income
+        ,msub.affirm_income, null as sort_no
         from pay_member_project pmp
         left join sys_user su on pmp.director_id = su.id
         inner join pay_member_project_subitem msub on pmp.id=msub.project_id
@@ -294,7 +294,7 @@
         <!-- 标协会员项目-->
         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
-        ,pcm.name as contacts_temporary_name,tmsub.affirm_income
+        ,pcm.name as contacts_temporary_name,tmsub.affirm_income, null as sort_no
         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
@@ -323,7 +323,7 @@
         <!-- 标协会员项目-->
         UNION ALL
         select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id, su.realname,tcp.company_name,tcp.amount_receivable,tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,tcp.liaison_man
-        ,tcp.affirm_income
+        ,tcp.affirm_income, null as sort_no
         from tb_member_project tmember
         left join sys_user su on tmember.director_id = su.id
         inner join tb_certificate_payment tcp on tmember.id = tcp.project_id
@@ -351,7 +351,17 @@
         <if test="packId != null and packId != ''">
             WHERE project.id NOT IN (SELECT project_id FROM pay_pack_company_project where pack_id = #{packId})
         </if>
-        ORDER BY create_time desc
+        ORDER BY
+        CASE
+        WHEN project.projectType = 2 THEN 0
+        ELSE 1
+        END,
+        CASE
+        WHEN project.projectType = 2 AND project.sort_no IS NULL THEN 1
+        WHEN project.projectType = 2 THEN 0
+        END,
+        sort_no,
+        create_time desc
     </select>
     <select id="queryPackToYear" resultType="java.lang.String">
         SELECT ppcp.project_id