From ab6983accb77decfcf5da3443d230886641c488e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 2 Aug 2022 11:41:55 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A8=8E=E9=A2=9D=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81,=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=94=B6=E5=85=A5=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayPaymentRecordMapper.xml     | 19 +++++++++++++------
 .../jero/project/entity/PayCommonProject.java |  1 +
 2 files changed, 14 insertions(+), 6 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 ecd99f41..402c094b 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
@@ -222,10 +222,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
+        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
         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
         from pay_common_project c
         left join sys_user su on c.principal_id = su.id
         where
@@ -255,7 +257,8 @@
         </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
+        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
         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
@@ -286,7 +289,8 @@
         </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
+        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
         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
@@ -317,7 +321,8 @@
         </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
+        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
         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
@@ -348,7 +353,8 @@
         </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
+        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
         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
@@ -379,7 +385,8 @@
         </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
+        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
         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
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
index eab079c8..ca4b4bee 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
@@ -103,6 +103,7 @@ public class PayCommonProject implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal paidAmount;
 
+    @Excel(name = "确认到账金额（元）", width = 15,orderNum = "6")
     @ApiModelProperty(value = "确认到账金额（元）")
     @DecimalMax(value = "9999999999.99",message = "确认到账金额（元）格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)