From cabe6eb018ada17691708d606c4b80029f0fccbf Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 24 Jul 2023 17:43:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=20=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=88=E4=BB=A3=E4=BB=98=EF=BC=89=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayPaymentRecordMapper.xml     | 125 ++++++++++++------
 1 file changed, 88 insertions(+), 37 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
index 0223d476..20d87319 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
@@ -190,7 +190,9 @@
         </if>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_id,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,
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_id,
+        if(tmsub.company_name = tmsub.header_name or tmsub.header_name is null, tmsub.company_name , concat(tmsub.company_name,'(代付)'))  as 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.invoice_amount,tmsub.post_contact_id,'' as register_check_result,tmsub.liaison_man,tmsub.payment_status,tmsub.company_id,tmsub.confirm_amount,tmsub.affirm_income
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
@@ -202,10 +204,14 @@
             AND 1=2
         </if>
         <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND tmember.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
+            AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%')
         </if>
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND tmsub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
+            AND (
+                tmsub.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
+                or
+                tmsub.header_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
+            )
         </if>
         <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
             AND tmsub.payment_status = #{payCommonProject.paymentStatus}
@@ -225,7 +231,9 @@
         </if>
         <!-- 标协证书项目-->
         UNION ALL
-        select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_id,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,
+        select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_id,
+        if(tcp.company_name = tcp.header_name or tcp.header_name is null, tcp.company_name , concat(tcp.company_name,'(代付)'))  as 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.invoice_amount,tcp.post_contact_id,'' as register_check_result,tcp.liaison_man,tcp.payment_status,tcp.company_id,tcp.confirm_amount,tcp.affirm_income
         from tb_member_project tmember
         inner join tb_certificate_payment tcp on tmember.id=tcp.project_id
@@ -237,10 +245,14 @@
             AND 1=2
         </if>
         <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND tmember.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
+            AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%')
         </if>
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND tcp.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
+            AND (
+                tcp.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
+                or
+                tcp.header_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
+            )
         </if>
         <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
             AND tcp.payment_status = #{payCommonProject.paymentStatus}
@@ -262,14 +274,14 @@
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
         where
         1=1
-        <if test="param2.startAmount != null and param2.startAmount != '' and param2.endAmount != null and param2.endAmount != ''">
-            AND p.receivable_amount between #{param2.startAmount} and #{param2.endAmount}
+        <if test="payCommonProject.startAmount != null and payCommonProject.startAmount != '' and payCommonProject.endAmount != null and payCommonProject.endAmount != ''">
+            AND p.receivable_amount between #{payCommonProject.startAmount} and #{payCommonProject.endAmount}
         </if>
-        <if test="param2.startAmount == null and param2.endAmount != null">
-            AND p.receivable_amount <![CDATA[<=]]> #{param2.endAmount}
+        <if test="payCommonProject.startAmount == null and payCommonProject.endAmount != null">
+            AND p.receivable_amount <![CDATA[<=]]> #{payCommonProject.endAmount}
         </if>
-        <if test="param2.startAmount != null and param2.endAmount == null">
-            AND p.receivable_amount <![CDATA[>=]]> #{param2.startAmount}
+        <if test="payCommonProject.startAmount != null and payCommonProject.endAmount == null">
+            AND p.receivable_amount <![CDATA[>=]]> #{payCommonProject.startAmount}
         </if>
         <if test="projectType != null and projectType != ''">
             AND p.projectType = #{projectType}
@@ -282,12 +294,12 @@
 
     <!--    到账开票导出-->
     <select id="mainListExportXls" resultType="com.jero.project.vo.PayCommonProjectOutput">
-        select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType,p.charge_company_temporary_id,
-        p.confirm_amount,p.contacts_temporary_name
+        select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_id,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType,
+        p.invoice_amount,p.mail_contacts_id,p.register_check_result,p.contacts_temporary_name,p.payment_status,p.charge_company_temporary_id,p.confirm_amount,p.affirm_income
         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.charge_company_temporary_id
-        ,c.confirm_amount,c.contacts_temporary_name
+        select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_name,c.charge_company_id,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.invoice_amount,c.mail_contacts_id,'' as register_check_result,c.contacts_temporary_name,c.payment_status,c.charge_company_temporary_id,c.confirm_amount,c.affirm_income
         from pay_common_project c
         left join sys_user su on c.principal_id = su.id
         where
@@ -315,10 +327,13 @@
             AND (c.paid_amount <![CDATA[<]]> c.invoice_amount or
             (c.paid_amount is null and c.invoice_amount is not null and c.invoice_amount !=0))
         </if>
+        <if test="payCommonProject.affirmIncome != null">
+            AND c.affirm_income = #{payCommonProject.affirmIncome}
+        </if>
         <!--工作组项目-->
         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,gsub.charge_company_temporary_id,
-        gsub.confirm_amount,gsubc.contacts_temporary_name
+        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_id,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,
+        gsub.invoice_amount,gsub.mail_contacts_id,'' as register_check_result,gsubc.contacts_temporary_name as contacts_temporary_name_one,gsub.payment_status,gsub.charge_company_temporary_id,gsub.confirm_amount,gsub.affirm_income
         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
@@ -348,13 +363,16 @@
             AND (gsub.paid_amount <![CDATA[<]]> gsub.invoice_amount or
             (gsub.paid_amount is null and gsub.invoice_amount is not null and gsub.invoice_amount !=0))
         </if>
+        <if test="payCommonProject.affirmIncome != null">
+            AND gsub.affirm_income = #{payCommonProject.affirmIncome}
+        </if>
         <!-- 会议项目-->
         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_id,
-        sit.confirm_amount,sit.company_contact_name
+        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_id,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.invoice_amount,sit.post_contact_id,sit.register_check_result,sit.company_contact_name,sit.payment_status,sit.company_id,sit.confirm_amount,sit.affirm_income
         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
+        left join sys_user su on su.id = meeting.director_id
         where
         sit.amount_receivable <![CDATA[<>]]> 0
         and sit.amount_receivable is not null
@@ -380,21 +398,24 @@
             AND (sit.paid_amount <![CDATA[<]]> sit.invoice_amount or
             (sit.paid_amount is null and sit.invoice_amount is not null and sit.invoice_amount !=0))
         </if>
+        <if test="payCommonProject.affirmIncome != null">
+            AND sit.affirm_income = #{payCommonProject.affirmIncome}
+        </if>
         <!-- 会员项目-->
         UNION ALL
-        select msub.id,member.project_name,msub.charge_use,member.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_temporary_id,
-        msub.confirm_amount,msub.company_contact_name
-        from pay_member_project member
-        left join sys_user su on member.director_id = su.id
-        inner join pay_member_project_subitem msub on member.id=msub.project_id
+        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,su.realname,msub.company_id,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.invoice_amount,msub.post_contact_id,'' as register_check_result,msub.company_contact_name,msub.payment_status,msub.company_temporary_id,msub.confirm_amount,msub.affirm_income
+        from pay_member_project pmp
+        inner join pay_member_project_subitem msub on pmp.id=msub.project_id
+        left join sys_user su on su.id = pmp.director_id
         where
         msub.amount_receivable <![CDATA[<>]]> 0
         and msub.amount_receivable is not null
         <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
-            AND member.director_id = #{payCommonProject.principalId}
+            AND pmp.director_id = #{payCommonProject.principalId}
         </if>
         <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND member.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
+            AND pmp.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
         </if>
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND msub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
@@ -412,13 +433,18 @@
             AND (msub.paid_amount <![CDATA[<]]> msub.invoice_amount or
             (msub.paid_amount is null and msub.invoice_amount is not null and msub.invoice_amount !=0))
         </if>
+        <if test="payCommonProject.affirmIncome != null">
+            AND msub.affirm_income = #{payCommonProject.affirmIncome}
+        </if>
         <!-- 标协会员项目-->
         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.company_id,
-        tmsub.confirm_amount,tmsub.liaison_man
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_id,
+        if(tmsub.company_name = tmsub.header_name or tmsub.header_name is null, tmsub.company_name , concat(tmsub.company_name,'(代付)'))  as 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.invoice_amount,tmsub.post_contact_id,'' as register_check_result,tmsub.liaison_man,tmsub.payment_status,tmsub.company_id,tmsub.confirm_amount,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 sys_user su on su.id = tmember.director_id
         where
         tmsub.amount_receivable <![CDATA[<>]]> 0
         and tmsub.amount_receivable is not null
@@ -426,10 +452,14 @@
             AND 1=2
         </if>
         <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND tmember.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
+            AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%')
         </if>
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND tmsub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
+            AND (
+            tmsub.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
+            or
+            tmsub.header_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
+            )
         </if>
         <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
             AND tmsub.payment_status = #{payCommonProject.paymentStatus}
@@ -444,10 +474,15 @@
             AND (tmsub.paid_amount <![CDATA[<]]> tmsub.invoice_amount or
             (tmsub.paid_amount is null and tmsub.invoice_amount is not null and tmsub.invoice_amount !=0))
         </if>
+        <if test="payCommonProject.affirmIncome != null">
+            AND tmsub.affirm_income = #{payCommonProject.affirmIncome}
+        </if>
         <!-- 标协证书项目-->
         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.company_id,
-        tcp.confirm_amount,tcp.liaison_man
+        select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id,su.realname,tcp.company_id,
+        if(tcp.company_name = tcp.header_name or tcp.header_name is null, tcp.company_name , concat(tcp.company_name,'(代付)'))  as 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.invoice_amount,tcp.post_contact_id,'' as register_check_result,tcp.liaison_man,tcp.payment_status,tcp.company_id,tcp.confirm_amount,tcp.affirm_income
         from tb_member_project tmember
         inner join tb_certificate_payment tcp on tmember.id=tcp.project_id
         left join sys_user su on su.id = tmember.director_id
@@ -458,10 +493,14 @@
             AND 1=2
         </if>
         <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND tmember.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
+            AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%')
         </if>
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-            AND tcp.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
+            AND (
+            tcp.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
+            or
+            tcp.header_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
+            )
         </if>
         <if test="payCommonProject.paymentStatus != null and payCommonProject.paymentStatus != ''">
             AND tcp.payment_status = #{payCommonProject.paymentStatus}
@@ -476,10 +515,22 @@
             AND (tcp.paid_amount <![CDATA[<]]> tcp.invoice_amount or
             (tcp.paid_amount is null and tcp.invoice_amount is not null and tcp.invoice_amount !=0))
         </if>
+        <if test="payCommonProject.affirmIncome != null">
+            AND tcp.affirm_income = #{payCommonProject.affirmIncome}
+        </if>
         )p
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
         where
         1=1
+        <if test="payCommonProject.startAmount != null and payCommonProject.startAmount != '' and payCommonProject.endAmount != null and payCommonProject.endAmount != ''">
+            AND p.receivable_amount between #{payCommonProject.startAmount} and #{payCommonProject.endAmount}
+        </if>
+        <if test="payCommonProject.startAmount == null and payCommonProject.endAmount != null">
+            AND p.receivable_amount <![CDATA[<=]]> #{payCommonProject.endAmount}
+        </if>
+        <if test="payCommonProject.startAmount != null and payCommonProject.endAmount == null">
+            AND p.receivable_amount <![CDATA[>=]]> #{payCommonProject.startAmount}
+        </if>
         <if test="projectType != null and projectType != ''">
             AND p.projectType = #{projectType}
         </if>