From 3b134541481b95f2ded6b6bf2d7d60855a1826ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 16 Sep 2021 11:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/mapper/xml/ProjectDetailMapper.xml    | 11 ++++++-----
 .../common/service/impl/ProjectDetailServiceImpl.java |  1 +
 .../main/java/com/jero/common/vo/ProjectDetailVO.java |  3 +++
 .../controller/PayCompanyManagementController.java    |  6 +++---
 .../com/jero/contract/entity/PayIncomeContract.java   |  6 +++---
 .../service/impl/PaySpendingContractServiceImpl.java  |  2 +-
 .../controller/PayCommonProjectController.java        |  6 ------
 .../com/jero/project/entity/PayCommonProject.java     |  3 +++
 .../entity/PayCompanyManagementTemporary.java         |  8 ++------
 .../entity/PayContactsManagementTemporary.java        |  8 --------
 10 files changed, 22 insertions(+), 32 deletions(-)

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 c7905971..39f44d71 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
@@ -4,7 +4,7 @@
 
     <select id="queryProject" resultType="com.jero.project.entity.PayCommonProject">
         <!-- 普通项目-->
-        select c.id,c.charge_project, c.charge_use, c.principal_id,c.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
+        select c.id,c.charge_project, c.charge_use, c.principal_id,c.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
         from pay_common_project c
         <where>
             <if test="projectId != null and projectId != ''">
@@ -13,7 +13,8 @@
         </where>
         <!--工作组项目-->
         UNION ALL
-        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,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
+        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,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,
+        (select GROUP_CONCAT(file_id) from pay_distribution_record where project_id=gsub.id) as files
         from pay_working_group g
         inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
         <where>
@@ -23,7 +24,7 @@
         </where>
         <!-- 会议项目-->
         UNION ALL
-        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_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_temporary_id,sit.pay_mode
+        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_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_temporary_id,sit.pay_mode,''
         from pay_meeting meeting
         inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
         <where>
@@ -33,7 +34,7 @@
         </where>
         <!-- 会员项目-->
         UNION ALL
-        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,pmp.director_name,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
+        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,pmp.director_name,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,''
         from pay_member_project pmp
         inner join pay_member_project_subitem msub on pmp.id = msub.project_id
         <where>
@@ -43,7 +44,7 @@
         </where>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'','','',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
+        select tmsub.id,tmember.project_name,tmsub.charge_use,'','','',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,''
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         <where>
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 c25b026c..235d295a 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
@@ -81,6 +81,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
         projectDetailVO.setRemarks(payCommonProject.getRemarks());
         projectDetailVO.setProjectType(payCommonProject.getProjectType());
         projectDetailVO.setChargeWay(payCommonProject.getChargeWay());
+        projectDetailVO.setFiles(payCommonProject.getFiles());
         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 613384b8..d98f675b 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
@@ -127,6 +127,9 @@ public class ProjectDetailVO implements Serializable {
      */
     @ApiModelProperty(value = "企业联系人地址")
     private String contactAddress;
+    /** 资料id，多个资料文件，逗号分隔 **/
+    @ApiModelProperty(value = "资料id，多个资料文件，逗号分隔")
+    private String files;
     /**
      * 到账信息
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
index f74b6439..5ed5e8be 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
@@ -202,12 +202,12 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		return Result.OK("编辑成功!");
 	}
 	 /**
-	  *   审核
+	  *   确认
 	  *
 	  * @param id 企业管理id
 	  * @return
 	  */
-	 @ApiOperation(value="企业管理-审核", notes="企业管理-审核")
+	 @ApiOperation(value="企业管理-确认", notes="企业管理-确认")
 	 @GetMapping(value = "/audit")
 	 public Result<?> audit(@RequestParam(name="id") String id) {
 		 if(StringUtils.isBlank(id)){
@@ -220,7 +220,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		 updatePayCompanyManagement.set(PayCompanyManagement::getUpdateBy,sysUser.getUsername());
 		 updatePayCompanyManagement.set(PayCompanyManagement::getUpdateTime,new Date());
 		 payCompanyManagementService.update(updatePayCompanyManagement);
-		 return Result.OK("审核成功!");
+		 return Result.OK("确认成功!");
 	 }
 	/**
 	 *   通过id删除
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java
index 8a7edffb..604cbc61 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java
@@ -160,9 +160,9 @@ public class PayIncomeContract implements Serializable {
     @DecimalMax(value = "9999999999.99",message = "未收金额格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal outstandingAmount;
-	/**账款状态（1：未支付，2：部分支付，3：已付全款）*/
-	@Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15)
-    @ApiModelProperty(value = "账款状态（1：未支付，2：部分支付，3：已付全款）")
+	/**账款状态（1：待收款，2：部分收款，3：已收全款）*/
+	@Excel(name = "账款状态（1：待收款，2：部分收款，3：已收全款）", width = 15)
+    @ApiModelProperty(value = "账款状态（1：待收款，2：部分收款，3：已收全款）")
     @Max(value = 3,message = "账款状态格式错误")
     @Dict(dicCode = "revenue_contract_account_status")
     private java.lang.Integer accountStatus;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index 2f9a028f..8e8c6cdb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -517,7 +517,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                         }else{
                             paySpendingContract.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS1);
                         }
-                        paySpendingContract.setNoTaxAmount(paySpendingContract.getContractAmount().subtract(paySpendingContract.getContractAmount().multiply(paySpendingContract.getRate().divide(new BigDecimal("100")))));
+                        paySpendingContract.setNoTaxAmount(paySpendingContract.getContractAmount().divide(new BigDecimal("1").add(paySpendingContract.getRate().divide(new BigDecimal("100")))));
                         setPaySpendingContract(paySpendingContract);
                         paySpendingContractService.save(paySpendingContract);
                         List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 1be1fdc0..b825ffd1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -1,6 +1,5 @@
 package com.jero.project.controller;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -11,14 +10,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.vo.ProjectDetailVO;
 import com.jero.contract.entity.PayIncomeContract;
@@ -28,9 +24,7 @@ import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.pack.service.IPayPackCompanyProjectService;
-import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.project.common.PayProjectCommon;
-import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
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 3ec80eb5..20d1eec8 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
@@ -151,6 +151,9 @@ public class PayCommonProject implements Serializable {
     @ApiModelProperty(value = "备注")
     @Size(max = 200,message = "备注长度不能大于200个字符")
     private String remarks;
+    /** 资料id，多个资料文件，逗号分隔 **/
+    @ApiModelProperty(value = "资料id，多个资料文件，逗号分隔")
+    private String files;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java
index 043e037b..59f01794 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java
@@ -64,13 +64,9 @@ public class PayCompanyManagementTemporary implements Serializable {
     @ApiModelProperty(value = "税号")
     private java.lang.String dutyCode;
 	/**数据来源(1：管理端，2：报名)*/
-	@Excel(name = "数据来源(1：管理端，2：报名)", width = 15)
-    @ApiModelProperty(value = "数据来源(1：管理端，2：报名)")
+	@Excel(name = "数据来源(1：财务人员，2：其他人)", width = 15)
+    @ApiModelProperty(value = "数据来源(1：财务人员，2：其他人)")
     private java.lang.Integer dataSource;
-	/**报名新增（1：是，0：否）*/
-	@Excel(name = "报名新增（1：是，0：否）", width = 15)
-    @ApiModelProperty(value = "报名新增（1：是，0：否）")
-    private java.lang.Integer signingUp;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java
index a3f345aa..c8499b2d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java
@@ -67,14 +67,6 @@ public class PayContactsManagementTemporary implements Serializable {
 	@Excel(name = "邮政编码", width = 15)
     @ApiModelProperty(value = "邮政编码")
     private java.lang.String postalCode;
-	/**数据来源(1：管理端，2：报名)*/
-	@Excel(name = "数据来源(1：管理端，2：报名)", width = 15)
-    @ApiModelProperty(value = "数据来源(1：管理端，2：报名)")
-    private java.lang.Integer dataSource;
-	/**报名新增（0：否，1：:是）*/
-	@Excel(name = "报名新增（0：否，1：:是）", width = 15)
-    @ApiModelProperty(value = "报名新增（0：否，1：:是）")
-    private java.lang.Integer signingUp;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")