From f98fc2fd9078974a68fc0578b7c22031c85abd9b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 10 Nov 2022 10:42:12 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A8=8E=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/mapper/xml/ProjectDetailMapper.xml   |  6 ++++++
 .../service/impl/ProjectDetailServiceImpl.java  |  3 +++
 .../com/jero/common/vo/ProjectDetailVO.java     | 17 +++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
index ec9a88d6..22241346 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
@@ -5,6 +5,7 @@
     <select id="queryProject" resultType="com.jero.project.entity.PayCommonProject">
         <!-- 普通项目-->
         select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_name,c.contacts_temporary_id,c.contacts_temporary_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,'' as phone,'' as email,c.remarks,c.contract_num,c.charge_company_temporary_id,c.charge_way,c.files,c.charge_notice_no,c.charge_notice_id,c.year,c.mail_contacts_temporary_name,'' as mission_and_objectives
+        ,c.tax_rate,c.tax,c.no_tax_amount
         from pay_common_project c
         left join sys_user su on c.principal_id = su.id
         <where>
@@ -15,6 +16,7 @@
         <!--工作组项目-->
         UNION ALL
         select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,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.remarks,gsub.contract_num,gsub.charge_company_temporary_id,gsub.charge_way,'',gsub.charge_notice_no,gsub.charge_notice_id,g.year,gsub.mail_contacts_temporary_name,g.mission_and_objectives
+        ,gsub.tax_rate,gsub.tax,gsub.no_tax_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
@@ -26,6 +28,7 @@
         <!-- 会议项目-->
         UNION ALL
         select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,sit.company_contact_id,sit.company_contact_name,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.remark,'',sit.company_id,sit.pay_mode,'','','','','',''
+        ,sit.tax_rate,sit.tax,sit.no_tax_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
@@ -37,6 +40,7 @@
         <!-- 会员项目-->
         UNION ALL
         select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,su.realname,msub.company_contact_temporary_id,msub.company_contact_name,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.remark,msub.contract_no,msub.company_temporary_id,msub.payment_method,'',msub.charge_notice_no,msub.charge_notice_file_id,pmp.particular_year,msub.post_contact_name,''
+        ,msub.tax_rate,msub.tax,msub.no_tax_amount
         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
@@ -48,6 +52,7 @@
         <!-- 标协会员项目-->
         UNION ALL
         select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.liaison_man_id,tmsub.liaison_man,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.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,'','','',tmember.year,'',''
+        ,tmsub.tax_rate,tmsub.tax,tmsub.no_tax_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
@@ -59,6 +64,7 @@
         <!-- 标协会员证书项目-->
         UNION ALL
         select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,tmps.mobile,tmps.email,'','',tmps.company_id,tmps.payment_method,'','','',tmember.year,'',''
+        ,tmps.tax_rate,tmps.tax,tmps.no_tax_amount
         from tb_member_project tmember
         left join sys_user su on tmember.director_id = su.id
         inner join tb_certificate_payment tmps on tmember.id=tmps.project_id
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
index d8cab966..d331adfc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
@@ -139,6 +139,9 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
         projectDetailVO.setFiles(payCommonProject.getFiles());
         projectDetailVO.setChargeNoticeNo(payCommonProject.getChargeNoticeNo());
         projectDetailVO.setChargeNoticeId(payCommonProject.getChargeNoticeId());
+        projectDetailVO.setTax(payCommonProject.getTax());
+        projectDetailVO.setTaxRate(payCommonProject.getTaxRate());
+        projectDetailVO.setNoTaxAmount(payCommonProject.getNoTaxAmount());
         if(!Objects.isNull(payCommonProject.getChargeWay())){
             // 普通项目，工作组，会员
             if(Objects.equals(String.valueOf(payCommonProject.getProjectType()),ProjectCommon.PROJECT_TYPE1)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
index 174ba8fe..7141e18d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
@@ -1,6 +1,7 @@
 package com.jero.common.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.project.entity.PayWorkingGroupSubItemContacts;
 import io.swagger.annotations.ApiModelProperty;
@@ -268,4 +269,20 @@ public class ProjectDetailVO implements Serializable {
     @ApiModelProperty(value = "工作组企业联系人列表")
     private List<PayWorkingGroupSubItemContacts> payWorkingGroupSubItemContactsList;
 
+    /**税率*/
+    @ApiModelProperty(value = "税率")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @Dict(dicCode = "rate")
+    private BigDecimal taxRate;
+
+    /**税额*/
+    @ApiModelProperty(value = "税额")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal tax;
+
+    /**未税金额*/
+    @ApiModelProperty(value = "未税金额")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal noTaxAmount;
+
 }