add 到账开票-新增确认收入的查询条件

jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml

@@ -79,6 +79,9 @@
               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_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,
@@ -112,6 +115,9 @@
             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_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,
@@ -144,6 +150,9 @@
             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,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,
@@ -176,6 +185,9 @@
             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_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,
@@ -208,6 +220,9 @@
             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_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,
@@ -240,6 +255,9 @@
             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