From c5870fc26ce9845ea82b1b4318b65b6b7cc954d5 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 09:12:22 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/company/common/PayCompanyManagementCommon.java | 2 +-
 .../company/controller/PayCompanyManagementController.java  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java
index 41c527ec..9d085b26 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java
@@ -16,7 +16,7 @@ public class PayCompanyManagementCommon {
     /**
      * 审核状态（1：通过，2：待审核）财务人员添加企业不需要审核默认是通过状态
      */
-    public final static Integer STATUS2 = 1;
+    public final static Integer STATUS2 = 2;
     /**
      * 财务角色
      */
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 d418cd09..f74b6439 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
@@ -171,15 +171,13 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 			return Result.error(msg.toString());
 		}
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		// 查看角色是否为财务人员
-		int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
 		int status = PayCompanyManagementCommon.STATUS2;
+		// 只有财务人员操作不需要重新审核，其他人都需要审核
 		if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
-			dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
 			status = PayCompanyManagementCommon.STATUS1;
 		}
-		payCompanyManagement.setDataSource(dataSource);
 		payCompanyManagement.setStatus(status);
+
 		try {
 			// 编辑保存企业前再次校验企业名称是否存在
 			LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();

From 76f8444f694fc2141a849b3130aacc5f4798dbd1 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 16 Sep 2021 09:51:31 +0800
Subject: [PATCH 02/10] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/member/entity/TbMemberProjectSubitem.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
index aa66dd82..302d1de1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
@@ -87,6 +87,11 @@ public class TbMemberProjectSubitem implements Serializable {
     @Dict(dicCode = "member_type")
     private Integer memberType;
 
+    /**联系人id*/
+    @Excel(name = "联系人id", width = 15)
+    @ApiModelProperty(value = "联系人id")
+    private String liaisonManId;
+
 	/**联系人*/
 	@Excel(name = "联系人", width = 15)
     @ApiModelProperty(value = "联系人")

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 03/10] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8F=98=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 = "备注")

From 3a49bcda99d736139759a7b64a4c5470e817e854 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Thu, 16 Sep 2021 11:37:44 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=82=AE=E5=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/constant/GlobalConstants.java |  27 +++
 .../controller/PayMailBillController.java     | 184 +++++++++++++-----
 .../controller/PayMailContractController.java |  31 +--
 3 files changed, 160 insertions(+), 82 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/constant/GlobalConstants.java b/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/constant/GlobalConstants.java
index b3a38066..f4866253 100644
--- a/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/constant/GlobalConstants.java
+++ b/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/constant/GlobalConstants.java
@@ -11,4 +11,31 @@ public class GlobalConstants {
      * redis消息通道名称
      */
     public static final String REDIS_TOPIC_NAME="jero_redis_topic";
+
+    /**
+     * 1
+     */
+    public static final Integer ONE=1;
+
+
+    /**
+     * 2
+     */
+    public static final Integer TWO=2;
+
+
+    /**
+     * 3
+     */
+    public static final Integer THERE=3;
+
+    /**
+     * 4
+     */
+    public static final Integer FORE=4;
+
+    /**
+     * 5
+     */
+    public static final Integer FIVE=5;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 275bc4e7..d2f9cfc4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -1,5 +1,6 @@
 package com.jero.mail.controller;
 
+import java.math.BigDecimal;
 import java.security.PrivateKey;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -7,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -20,6 +22,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
+import com.jero.common.common.ProjectCommon;
+import com.jero.common.constant.GlobalConstants;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
@@ -33,10 +38,15 @@ import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.entity.PayMailBillSearch;
 import com.jero.mail.service.IPayMailBillProjectService;
 import com.jero.mail.service.IPayMailBillService;
+import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.member.entity.PayMemberProjectSubitem;
 import com.jero.member.service.IPayMemberProjectSubitemService;
+import com.jero.member.service.ITbMemberProjectSubitemService;
+import com.jero.project.service.IPayCommonProjectService;
+import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.util.AmountUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -55,18 +65,29 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/mail/payMailBill")
 @Slf4j
 public class PayMailBillController extends JeroController<PayMailBill, IPayMailBillService> {
-	@Autowired
-	private IPayMailBillService payMailBillService;
-	 @Autowired
-	private ProjectDetailService projectDetailService;
-	 @Autowired
-	 private IPayContactsManagementService iPayContactsManagementService;
-	 @Autowired
-	 private IPayMailBillProjectService iPayMailBillProjectService;
 
-	 @Autowired
-	 private IPayMemberProjectSubitemService iPayMemberProjectSubitemService;
-	/**
+		 @Autowired
+		 private IPayMailBillProjectService payMailBillProjectService;
+		 @Autowired
+		 private IPayMailBillService payMailBillService;
+		 @Autowired
+		 private ProjectDetailService projectDetailService;
+		 @Autowired
+		 private IPayContactsManagementService iPayContactsManagementService;
+		 @Autowired
+		 private IPayMailBillProjectService iPayMailBillProjectService;
+		 @Autowired
+		 private IPayCommonProjectService payCommonProjectService;
+		 @Autowired
+		 private IPayMemberProjectSubitemService payMemberProjectSubitemService;
+		 @Autowired
+		 private IPayMeetingSituationService payMeetingSituationService;
+		 @Autowired
+		 private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
+		 @Autowired
+		 private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
+
+		/**
 	 * 分页列表查询
 	 *
 	 * @param payMailBillSearch
@@ -133,35 +154,89 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		 return Result.OK(projectDetailVO);
 	 }
 	
-	/**
-	 *  编辑
-	 *
-	 */
-	@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
-	@Transactional
-	@PostMapping(value = "/edit")
-	public Result<?> edit(@RequestParam(name="id") String id,
-						  @RequestParam(name="sendMethod") Integer sendMethod,
-						  @RequestParam(name="postNo") String postNo,
-						  @RequestParam(name="sendDate") String sendDate,
-						  @RequestParam(name="remark") String remark
-						  ) throws ParseException {
-		PayMailBill payMailBill = new PayMailBill();
-		payMailBill.setId(id);
-		payMailBill.setSendMethod(sendMethod);
-		payMailBill.setPostNo(postNo);
-		payMailBill.setRemark(remark);
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-		Date parse = simpleDateFormat.parse(sendDate);
-		payMailBill.setSendDate(parse);
-		payMailBill.setPostStatus(1);
-		payMailBillService.updateById(payMailBill);
-		//变更5种项目的邮寄状态
-
-
-
-		return Result.OK("编辑成功!");
-	}
+//	/**
+//	 *  编辑
+//	 *
+//	 */
+//	@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
+//	@Transactional
+//	@PostMapping(value = "/edit")
+//	public Result<?> edit(@RequestParam(name="id") String id,
+//						  @RequestParam(name="sendMethod") Integer sendMethod,
+//						  @RequestParam(name="postNo") String postNo,
+//						  @RequestParam(name="sendDate") String sendDate,
+//						  @RequestParam(name="remark") String remark
+//						  ) throws ParseException {
+//		PayMailBill payMailBill = new PayMailBill();
+//		payMailBill.setId(id);
+//		payMailBill.setSendMethod(sendMethod);
+//		payMailBill.setPostNo(postNo);
+//		payMailBill.setRemark(remark);
+//		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+//		Date parse = simpleDateFormat.parse(sendDate);
+//		payMailBill.setSendDate(parse);
+//		payMailBill.setPostStatus(1);
+//		payMailBillService.updateById(payMailBill);
+//		//变更5种项目的邮寄状态
+//
+//		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
+//		queryPayMailBillProject.eq(PayMailBillProject::getId,id);
+//		PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject);
+//		BigDecimal receivableAmount;
+//		//获取项目应收金额
+//		if(GlobalConstants.ONE.equals(one.getProjectType())){
+//			receivableAmount= payCommonProjectService.getById(one.getProjectId()).getReceivableAmount();}
+//		else if(GlobalConstants.TWO.equals(one.getProjectType())) {
+//			receivableAmount=	payWorkingGroupSubItemService.getById(one.getProjectId()).getReceivableAmount();
+//		}else if (GlobalConstants.THERE.equals(one.getProjectType())) {
+//			receivableAmount= payMeetingSituationService.getById(one.getProjectId()).getAmountReceivable();
+//		}else if (GlobalConstants.FORE.equals(one.getProjectType())) {
+//			receivableAmount= payMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
+//
+//		}else if (GlobalConstants.FIVE.equals(one.getProjectType())){
+//			receivableAmount=tbMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
+//		}
+//		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
+//		queryPayMailBillProject.eq(PayMailBillProject::getProjectId,one.getProjectId());
+//		List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject2);
+//
+//		// 开票金额
+//		BigDecimal invoice = new BigDecimal("0.00");
+//		// 开票次数
+//		int c = listPayMailBillProject.size();
+//		// 邮寄次数
+//		int y = 0;
+//		if(!CollectionUtils.isEmpty(listPayMailBillProject)){
+//			BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
+//			invoice = invoice.add(b);
+//			if(receivableAmount.compareTo(invoice) == -1){
+//				throw new JeroBootException("应收金额不能小于开票金额！");
+//			}
+//			List<String> list = listPayMailBillProject.stream().map(PayMailBillProject::getBillId).collect(Collectors.toList());
+//			LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
+//			queryPayMailBill.in(PayMailBill::getId,list);
+//			queryPayMailBill.eq(PayMailBill::getPostStatus, ProjectCommon.POST_STATUS1);
+//			List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
+//			y = listPayMailBill.size();
+//		}
+//		// 到账
+//		// 应收金额 = 实收金额 = 1
+//		if(receivableAmount.compareTo(payCommonProject.getPaidAmount()) == 0){
+//			projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT1);
+//		}
+//		// 0 = 实收金额 = 0
+//		if(payCommonProject.getPaidAmount().compareTo(new BigDecimal("0.00")) == 0){
+//			projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT0);
+//		}
+//		// 0 < 实收金额 && 实收金额 < 应收金额 = 2
+//		if(payCommonProject.getPaidAmount().compareTo(new BigDecimal("0.00")) == 1
+//				&& payCommonProject.getPaidAmount().compareTo(receivableAmount) ==-1){
+//			projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT2);
+//		}
+//
+//
+//		return Result.OK("编辑成功!");
+//	}
 
 	 /**
 	  *  编辑
@@ -170,20 +245,21 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @ApiOperation(value="邮寄票据-修改", notes="邮寄票据-修改")
 	 @Transactional
 	 @PostMapping(value = "/edit2")
-	 public Result<?> edit2(@RequestParam(name="id") String id,
-						   @RequestParam(name="sendMethod") Integer sendMethod,
-						   @RequestParam(name="postNo") String postNo,
-						   @RequestParam(name="sendDate") String sendDate,
-						   @RequestParam(name="remark") String remark
-	 ) throws ParseException {
-		 PayMailBill payMailBill = new PayMailBill();
-		 payMailBill.setId(id);
-		 payMailBill.setSendMethod(sendMethod);
-		 payMailBill.setPostNo(postNo);
-		 payMailBill.setRemark(remark);
-		 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-		 Date parse = simpleDateFormat.parse(sendDate);
-		 payMailBill.setSendDate(parse);
+	 public Result<?> edit2(PayMailBill payMailBill
+	 )  {
+		 payMailBill.setPostStatus(1);
+		 payMailBillService.updateById(payMailBill);
+		 return Result.OK("编辑成功!");
+	 }
+	 /**
+	  *  编辑
+	  *
+	  */
+	 @ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
+	 @Transactional
+	 @PostMapping(value = "/edit")
+	 public Result<?> edit(PayMailBill payMailBill
+	 )  {
 		 payMailBill.setPostStatus(1);
 		 payMailBillService.updateById(payMailBill);
 		 return Result.OK("编辑成功!");
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
index 62c29b33..c415b016 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
@@ -53,20 +53,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 		IPage<PayMailBillList> pageList = payMailContractService.pageContract(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param payMailContract
-	 * @return
-	 */
-	@AutoLog(value = "邮寄合同-添加")
-	@ApiOperation(value="邮寄合同-添加", notes="邮寄合同-添加")
-	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody PayMailContract payMailContract) {
-		payMailContractService.save(payMailContract);
-		return Result.OK("添加成功！");
-	}
+
 
 	 /**
 	  *  编辑
@@ -74,20 +61,8 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 	  */
 	 @ApiOperation(value="邮寄合同-编辑（邮寄和修改按钮统一接口）", notes="邮寄合同-编辑（邮寄和修改按钮统一接口）")
 	 @PostMapping(value = "/edit")
-	 public Result<?> edit(@RequestParam(name="id") String id,
-						   @RequestParam(name="sendMethod") Integer sendMethod,
-						   @RequestParam(name="postNo") String postNo,
-						   @RequestParam(name="sendDate") String sendDate,
-						   @RequestParam(name="remark") String remark
-	 ) throws ParseException {
-		 PayMailContract payMailContract = new PayMailContract();
-		 payMailContract.setId(id);
-		 payMailContract.setSendMethod(sendMethod);
-		 payMailContract.setPostno(postNo);
-		 payMailContract.setRemark(remark);
-		 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-		 Date parse = simpleDateFormat.parse(sendDate);
-		 payMailContract.setSenddate(parse);
+	 public Result<?> edit(PayMailContract payMailContract
+	 ) {
 		 payMailContract.setPostStatus(1);
 		 payMailContractService.updateById(payMailContract);
 		 return Result.OK("操作成功!");

From dbd2fe889ad06ff7dcfebebd2e388831ea2abd0e Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Thu, 16 Sep 2021 11:56:35 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=82=AE=E5=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/mail/controller/PayMailBillController.java | 5 ++---
 .../com/jero/mail/controller/PayMailContractController.java  | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index d2f9cfc4..b8dfa741 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -182,8 +182,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 //		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
 //		queryPayMailBillProject.eq(PayMailBillProject::getId,id);
 //		PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject);
-//		BigDecimal receivableAmount;
+//
 //		//获取项目应收金额
+//		BigDecimal receivableAmount = null;
 //		if(GlobalConstants.ONE.equals(one.getProjectType())){
 //			receivableAmount= payCommonProjectService.getById(one.getProjectId()).getReceivableAmount();}
 //		else if(GlobalConstants.TWO.equals(one.getProjectType())) {
@@ -247,7 +248,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @PostMapping(value = "/edit2")
 	 public Result<?> edit2(PayMailBill payMailBill
 	 )  {
-		 payMailBill.setPostStatus(1);
 		 payMailBillService.updateById(payMailBill);
 		 return Result.OK("编辑成功!");
 	 }
@@ -260,7 +260,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @PostMapping(value = "/edit")
 	 public Result<?> edit(PayMailBill payMailBill
 	 )  {
-		 payMailBill.setPostStatus(1);
 		 payMailBillService.updateById(payMailBill);
 		 return Result.OK("编辑成功!");
 	 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
index c415b016..ba30639d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
@@ -63,7 +63,6 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 	 @PostMapping(value = "/edit")
 	 public Result<?> edit(PayMailContract payMailContract
 	 ) {
-		 payMailContract.setPostStatus(1);
 		 payMailContractService.updateById(payMailContract);
 		 return Result.OK("操作成功!");
 	 }

From eed9cbc95818a5fccfba8de08455221700772c3a Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Thu, 16 Sep 2021 12:22:09 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=82=AE=E5=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/mail/controller/PayMailBillController.java    | 2 ++
 .../com/jero/mail/controller/PayMailContractController.java     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index b8dfa741..ea0d50b8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -248,6 +248,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @PostMapping(value = "/edit2")
 	 public Result<?> edit2(PayMailBill payMailBill
 	 )  {
+		 payMailBill.setPostStatus(1);
 		 payMailBillService.updateById(payMailBill);
 		 return Result.OK("编辑成功!");
 	 }
@@ -260,6 +261,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @PostMapping(value = "/edit")
 	 public Result<?> edit(PayMailBill payMailBill
 	 )  {
+		 payMailBill.setPostStatus(1);
 		 payMailBillService.updateById(payMailBill);
 		 return Result.OK("编辑成功!");
 	 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
index ba30639d..c415b016 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
@@ -63,6 +63,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 	 @PostMapping(value = "/edit")
 	 public Result<?> edit(PayMailContract payMailContract
 	 ) {
+		 payMailContract.setPostStatus(1);
 		 payMailContractService.updateById(payMailContract);
 		 return Result.OK("操作成功!");
 	 }

From b865cba8a2bc4769b61914aed2670a874ef3cfb6 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 16 Sep 2021 14:16:24 +0800
Subject: [PATCH 07/10] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=88=B0=E4=BC=9A=E5=91=98=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/util/AuthenticationUtils.java | 16 ++++++++++--
 .../controller/PayMeetingController.java      | 26 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java
index 75c15168..149605de 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.jero.common.exception.JeroBootException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -23,9 +24,9 @@ public class AuthenticationUtils {
     @Resource
     private RedisUtil redisUtil;
 
-    private static String URL;
+    public static String URL;
 
-    private static String APPLICATION_TOKEN;
+    public static String APPLICATION_TOKEN;
 
     @Value("${standards.url}")
     public void setURL(String url) {
@@ -88,4 +89,15 @@ public class AuthenticationUtils {
         return map;
     }
 
+    /**
+     * 校验返回值判断是否同步成功
+     * @param response
+     */
+    public static void checkResult(String response) {
+        JSONObject jsonObject = JSONObject.parseObject(response);
+        String code = jsonObject.getString("code");
+        if (!"200".equals(code)){
+            throw new JeroBootException("数据同步失败！");
+        }
+    }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 3829064c..924125c6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -6,7 +6,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
@@ -34,6 +37,7 @@ import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.system.volid.group.UpdateGroup;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.service.IPayWorkingGroupService;
+import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining;
 import com.jero.util.QrcodeUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import lombok.extern.slf4j.Slf4j;
@@ -324,6 +328,26 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         wrapper.eq(PayMeeting::getId,id);
         wrapper.set(PayMeeting::getMeetingData,fileIds);
         payMeetingService.update(wrapper);
+        List<String> idList = Arrays.asList(fileIds.split(","));
+        List<OSSFile> ossFiles = iossFileService.listByIds(idList);
+        for (OSSFile ossFile : ossFiles) {
+            String url = ossFile.getUrl();
+            String[] fileUrl = url.split("/");
+            int length = fileUrl.length;
+            ossFile.setFileName(fileUrl[length - 1]);
+        }
+        Map<String, String> stringStringMap = AuthenticationUtils.encryptByRsaPriKey();
+        String publicKey = stringStringMap.get("publicKey");
+        String token = stringStringMap.get("token");
+        String jsonString1 = JSONObject.toJSONString(ossFiles);
+        String post = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/addStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString1);
+        AuthenticationUtils.checkResult(post);
+        StableCrossTraining stableCrossTraining = new StableCrossTraining();
+        stableCrossTraining.setId(id);
+        stableCrossTraining.setMeetingFiles(fileIds);
+        String jsonString = JSONObject.toJSONString(stableCrossTraining);
+        String post1 = HttpUtil.post(AuthenticationUtils.URL + "/stablecrosstraining/stableCrossTraining/updateStandardsFile?publicKey=" + publicKey + "&token=" + token, jsonString);
+        AuthenticationUtils.checkResult(post1);
         return Result.OK("上传资料成功!");
     }
 
@@ -368,7 +392,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         String token = request.getParameter("token");
         authenticationUtils.check(token,publicKey);
         for (OSSFile ossFile : ossFileList) {
-            iossFileService.save(ossFile);
+            iossFileService.saveOrUpdate(ossFile);
         }
         return Result.OK("新增会议文件成功!");
     }

From eb5d6f3618975f1071ae7f3e642039d09088101d Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Thu, 16 Sep 2021 15:13:55 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=82=AE=E5=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMailBillController.java     | 196 +++++++++++-------
 .../controller/PayMailContractController.java |   2 +-
 .../com/jero/mail/entity/PayMailBillList.java |  16 +-
 .../com/jero/mail/entity/PayMailContract.java |   4 +-
 .../mail/mapper/xml/PayMailContractMapper.xml |   4 +-
 5 files changed, 141 insertions(+), 81 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index ea0d50b8..2ab820f3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -38,10 +38,14 @@ import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.entity.PayMailBillSearch;
 import com.jero.mail.service.IPayMailBillProjectService;
 import com.jero.mail.service.IPayMailBillService;
+import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.member.entity.PayMemberProjectSubitem;
+import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.service.IPayMemberProjectSubitemService;
 import com.jero.member.service.ITbMemberProjectSubitemService;
+import com.jero.project.entity.PayCommonProject;
+import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.util.AmountUtil;
@@ -154,72 +158,120 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		 return Result.OK(projectDetailVO);
 	 }
 	
-//	/**
-//	 *  编辑
-//	 *
-//	 */
-//	@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
-//	@Transactional
-//	@PostMapping(value = "/edit")
-//	public Result<?> edit(@RequestParam(name="id") String id,
-//						  @RequestParam(name="sendMethod") Integer sendMethod,
-//						  @RequestParam(name="postNo") String postNo,
-//						  @RequestParam(name="sendDate") String sendDate,
-//						  @RequestParam(name="remark") String remark
-//						  ) throws ParseException {
-//		PayMailBill payMailBill = new PayMailBill();
-//		payMailBill.setId(id);
-//		payMailBill.setSendMethod(sendMethod);
-//		payMailBill.setPostNo(postNo);
-//		payMailBill.setRemark(remark);
-//		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-//		Date parse = simpleDateFormat.parse(sendDate);
-//		payMailBill.setSendDate(parse);
-//		payMailBill.setPostStatus(1);
-//		payMailBillService.updateById(payMailBill);
-//		//变更5种项目的邮寄状态
-//
-//		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
-//		queryPayMailBillProject.eq(PayMailBillProject::getId,id);
-//		PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject);
-//
-//		//获取项目应收金额
-//		BigDecimal receivableAmount = null;
-//		if(GlobalConstants.ONE.equals(one.getProjectType())){
-//			receivableAmount= payCommonProjectService.getById(one.getProjectId()).getReceivableAmount();}
-//		else if(GlobalConstants.TWO.equals(one.getProjectType())) {
-//			receivableAmount=	payWorkingGroupSubItemService.getById(one.getProjectId()).getReceivableAmount();
-//		}else if (GlobalConstants.THERE.equals(one.getProjectType())) {
-//			receivableAmount= payMeetingSituationService.getById(one.getProjectId()).getAmountReceivable();
-//		}else if (GlobalConstants.FORE.equals(one.getProjectType())) {
-//			receivableAmount= payMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
-//
-//		}else if (GlobalConstants.FIVE.equals(one.getProjectType())){
-//			receivableAmount=tbMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
-//		}
-//		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
-//		queryPayMailBillProject.eq(PayMailBillProject::getProjectId,one.getProjectId());
-//		List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject2);
-//
-//		// 开票金额
-//		BigDecimal invoice = new BigDecimal("0.00");
-//		// 开票次数
-//		int c = listPayMailBillProject.size();
-//		// 邮寄次数
-//		int y = 0;
-//		if(!CollectionUtils.isEmpty(listPayMailBillProject)){
-//			BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
-//			invoice = invoice.add(b);
-//			if(receivableAmount.compareTo(invoice) == -1){
-//				throw new JeroBootException("应收金额不能小于开票金额！");
-//			}
-//			List<String> list = listPayMailBillProject.stream().map(PayMailBillProject::getBillId).collect(Collectors.toList());
-//			LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
-//			queryPayMailBill.in(PayMailBill::getId,list);
-//			queryPayMailBill.eq(PayMailBill::getPostStatus, ProjectCommon.POST_STATUS1);
-//			List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
-//			y = listPayMailBill.size();
-//		}
+	/**
+	 *  编辑
+	 *
+	 */
+	@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
+	@Transactional
+	@PostMapping(value = "/edit3")
+	public Result<?> edit3(@RequestParam(name="id") String id,
+						  @RequestParam(name="sendMethod") Integer sendMethod,
+						  @RequestParam(name="postNo") String postNo,
+						  @RequestParam(name="sendDate") String sendDate,
+						  @RequestParam(name="remark") String remark
+						  ) throws ParseException {
+		PayMailBill payMailBill = new PayMailBill();
+		payMailBill.setId(id);
+		payMailBill.setSendMethod(sendMethod);
+		payMailBill.setPostNo(postNo);
+		payMailBill.setRemark(remark);
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+		Date parse = simpleDateFormat.parse(sendDate);
+		payMailBill.setSendDate(parse);
+		payMailBill.setPostStatus(1);
+		payMailBillService.updateById(payMailBill);
+		//变更5种项目的邮寄状态
+
+		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
+		queryPayMailBillProject.eq(PayMailBillProject::getId,id);
+		PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject);
+
+		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
+		queryPayMailBillProject.eq(PayMailBillProject::getProjectId,one.getProjectId());
+		List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject2);
+
+		// 开票金额
+		BigDecimal invoice = new BigDecimal("0.00");
+		// 开票次数
+		int c = listPayMailBillProject.size();
+		// 邮寄次数
+		int y = 0;
+		if(!CollectionUtils.isEmpty(listPayMailBillProject)){
+			BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
+			invoice = invoice.add(b);
+			List<String> list = listPayMailBillProject.stream().map(PayMailBillProject::getBillId).collect(Collectors.toList());
+			LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
+			queryPayMailBill.in(PayMailBill::getId,list);
+			queryPayMailBill.eq(PayMailBill::getPostStatus, ProjectCommon.POST_STATUS1);
+			List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
+			y = listPayMailBill.size();
+		}
+		//获取项目应收金额
+		BigDecimal receivableAmount = null;
+		if(GlobalConstants.ONE.equals(one.getProjectType())){
+			receivableAmount= payCommonProjectService.getById(one.getProjectId()).getReceivableAmount();}
+		PayCommonProject payCommonProject = new PayCommonProject();
+			if(receivableAmount==invoice && c==y){
+				payCommonProject.setId(one.getProjectId());
+				payCommonProject.setMail(1);
+				payCommonProjectService.updateById(payCommonProject);
+			}else if(y<c&&y>0){
+				payCommonProject.setId(one.getProjectId());
+				payCommonProject.setMail(2);
+				payCommonProjectService.updateById(payCommonProject);
+			}
+		else if(GlobalConstants.TWO.equals(one.getProjectType())) {
+			receivableAmount=	payWorkingGroupSubItemService.getById(one.getProjectId()).getReceivableAmount();
+				PayWorkingGroupSubItem payWorkingGroupSubItem = new PayWorkingGroupSubItem();
+				if(receivableAmount==invoice && c==y){
+					payWorkingGroupSubItem.setId(one.getProjectId());
+					payWorkingGroupSubItem.setMail(1);
+					payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
+				}else if(y<c&&y>0){
+					payWorkingGroupSubItem.setId(one.getProjectId());
+					payWorkingGroupSubItem.setMail(2);
+					payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
+				}
+		}else if (GlobalConstants.THERE.equals(one.getProjectType())) {
+			receivableAmount= payMeetingSituationService.getById(one.getProjectId()).getAmountReceivable();
+				PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
+				if(receivableAmount==invoice && c==y){
+					payMeetingSituation.setId(one.getProjectId());
+					payMeetingSituation.setMail(1);
+					payMeetingSituationService.updateById(payMeetingSituation);
+				}else if(y<c&&y>0){
+					payMeetingSituation.setId(one.getProjectId());
+					payMeetingSituation.setMail(2);
+					payMeetingSituationService.updateById(payMeetingSituation);
+				}
+		}else if (GlobalConstants.FORE.equals(one.getProjectType())) {
+			receivableAmount= payMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
+				PayMemberProjectSubitem payMemberProjectSubitem = new PayMemberProjectSubitem();
+				if(receivableAmount==invoice && c==y){
+					payMemberProjectSubitem.setId(one.getProjectId());
+					payMemberProjectSubitem.setMail(1);
+					payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
+				}else if(y<c&&y>0){
+					payMemberProjectSubitem.setId(one.getProjectId());
+					payMemberProjectSubitem.setMail(2);
+					payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
+				}
+
+		}else if (GlobalConstants.FIVE.equals(one.getProjectType())){
+			receivableAmount=tbMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
+				TbMemberProjectSubitem tbMemberProjectSubitem = new TbMemberProjectSubitem();
+				if(receivableAmount==invoice && c==y){
+					tbMemberProjectSubitem.setId(one.getProjectId());
+					tbMemberProjectSubitem.setMail(1);
+					tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
+				}else if(y<c&&y>0){
+					tbMemberProjectSubitem.setId(one.getProjectId());
+					tbMemberProjectSubitem.setMail(2);
+					tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
+				}
+		}
+
 //		// 到账
 //		// 应收金额 = 实收金额 = 1
 //		if(receivableAmount.compareTo(payCommonProject.getPaidAmount()) == 0){
@@ -234,10 +286,10 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 //				&& payCommonProject.getPaidAmount().compareTo(receivableAmount) ==-1){
 //			projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT2);
 //		}
-//
-//
-//		return Result.OK("编辑成功!");
-//	}
+
+
+		return Result.OK("编辑成功!");
+	}
 
 	 /**
 	  *  编辑
@@ -246,7 +298,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @ApiOperation(value="邮寄票据-修改", notes="邮寄票据-修改")
 	 @Transactional
 	 @PostMapping(value = "/edit2")
-	 public Result<?> edit2(PayMailBill payMailBill
+	 public Result<?> edit2(@RequestBody PayMailBill payMailBill
 	 )  {
 		 payMailBill.setPostStatus(1);
 		 payMailBillService.updateById(payMailBill);
@@ -259,7 +311,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 @ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
 	 @Transactional
 	 @PostMapping(value = "/edit")
-	 public Result<?> edit(PayMailBill payMailBill
+	 public Result<?> edit(@RequestBody PayMailBill payMailBill
 	 )  {
 		 payMailBill.setPostStatus(1);
 		 payMailBillService.updateById(payMailBill);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
index c415b016..79b4c14e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
@@ -61,7 +61,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 	  */
 	 @ApiOperation(value="邮寄合同-编辑（邮寄和修改按钮统一接口）", notes="邮寄合同-编辑（邮寄和修改按钮统一接口）")
 	 @PostMapping(value = "/edit")
-	 public Result<?> edit(PayMailContract payMailContract
+	 public Result<?> edit(@RequestBody PayMailContract payMailContract
 	 ) {
 		 payMailContract.setPostStatus(1);
 		 payMailContractService.updateById(payMailContract);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java
index c48507ce..213d6f8e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java
@@ -1,9 +1,11 @@
 package com.jero.mail.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 @Data
 public class PayMailBillList {
@@ -45,11 +47,17 @@ public class PayMailBillList {
     private java.lang.String contractAmount;
 
 
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
 
-
-
-
-
+    /**邮寄时间*/
+    @Excel(name = "邮寄时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "邮寄时间")
+    private java.util.Date sendDate;
 
 
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java
index 25397d95..8ffbb1d3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java
@@ -62,13 +62,13 @@ public class PayMailContract implements Serializable {
 	/**快递单号*/
 	@Excel(name = "快递单号", width = 15)
     @ApiModelProperty(value = "快递单号")
-    private java.lang.String postno;
+    private java.lang.String postNo;
 	/**邮寄时间*/
 	@Excel(name = "邮寄时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "邮寄时间")
-    private java.util.Date senddate;
+    private java.util.Date sendDate;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
index 1d859169..2d0aa805 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
@@ -6,7 +6,7 @@ SELECT
 pc.id,
 pc.post_status as postStatus,
 pc.send_method as sendMethod,
-pc.postNo,
+pc.post_no as postNo,
 pc.liaison_man as liaisonMan,
 pc.mobile,
 pic.contract_num as contractNum,
@@ -23,7 +23,7 @@ SELECT
 pc.id,
 pc.post_status as postStatus,
 pc.send_method as sendMethod,
-pc.postNo,
+pc.post_no as postNo,
 pc.liaison_man as liaisonMan,
 pc.mobile,
 pic.contract_num as contractNum,

From d48b0e471f99cfc8b9a151d99a7e47899fc09a0b Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Thu, 16 Sep 2021 15:17:38 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=90=88=E5=90=8C=E9=82=AE=E5=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMailBillController.java     | 37 +++----------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 2ab820f3..6627946b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -164,27 +164,14 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 */
 	@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
 	@Transactional
-	@PostMapping(value = "/edit3")
-	public Result<?> edit3(@RequestParam(name="id") String id,
-						  @RequestParam(name="sendMethod") Integer sendMethod,
-						  @RequestParam(name="postNo") String postNo,
-						  @RequestParam(name="sendDate") String sendDate,
-						  @RequestParam(name="remark") String remark
-						  ) throws ParseException {
-		PayMailBill payMailBill = new PayMailBill();
-		payMailBill.setId(id);
-		payMailBill.setSendMethod(sendMethod);
-		payMailBill.setPostNo(postNo);
-		payMailBill.setRemark(remark);
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-		Date parse = simpleDateFormat.parse(sendDate);
-		payMailBill.setSendDate(parse);
-		payMailBill.setPostStatus(1);
-		payMailBillService.updateById(payMailBill);
+	@PostMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayMailBill payMailBill)  {
+		 payMailBill.setPostStatus(1);
+		 payMailBillService.updateById(payMailBill);
 		//变更5种项目的邮寄状态
 
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
-		queryPayMailBillProject.eq(PayMailBillProject::getId,id);
+		queryPayMailBillProject.eq(PayMailBillProject::getId,payMailBill.getId());
 		PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject);
 
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
@@ -304,19 +291,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 		 payMailBillService.updateById(payMailBill);
 		 return Result.OK("编辑成功!");
 	 }
-	 /**
-	  *  编辑
-	  *
-	  */
-	 @ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
-	 @Transactional
-	 @PostMapping(value = "/edit")
-	 public Result<?> edit(@RequestBody PayMailBill payMailBill
-	 )  {
-		 payMailBill.setPostStatus(1);
-		 payMailBillService.updateById(payMailBill);
-		 return Result.OK("编辑成功!");
-	 }
+
 //
 //	/**
 //	 *   通过id删除

From 59793dcc21d72ea7c66048c7610c757be2c48e5e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 16 Sep 2021 15:18:11 +0800
Subject: [PATCH 10/10] =?UTF-8?q?add=20=E4=BC=9A=E5=91=98=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=9F=A5=E8=AF=A2=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/util/SpringContextUtil.java   | 43 +++++++++++++++++++
 .../com/jero/config/shiro/ShiroConfig.java    |  1 +
 .../system/controller/SysUserController.java  | 40 +++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java
new file mode 100644
index 00000000..cb176626
--- /dev/null
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java
@@ -0,0 +1,43 @@
+package com.jero.common.util;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * Spring 上下文工具类
+ * @author liJiaRao
+ * @date 2021-09-16 15:05
+ */
+@Component
+public class SpringContextUtil implements ApplicationContextAware {
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(@NotNull ApplicationContext applicationContext) throws BeansException {
+        SpringContextUtil.applicationContext = applicationContext;
+    }
+
+    /**
+     * 获取上下文
+     */
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+    /**
+     * 通过 bena 名称获取上下文中的 bean
+     */
+    public static Object getBean(String name) {
+        return applicationContext.getBean(name);
+    }
+
+    /**
+     * 通过类型获取上下文中的bean
+     */
+    public static Object getBean(Class<?> requiredType) {
+        return applicationContext.getBean(requiredType);
+    }
+}
diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index 89338d0a..cc3fc4dc 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -96,6 +96,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/meeting/payMeeting/addStandards","anon");//会员系统推送会议
         filterChainDefinitionMap.put("/meeting/payMeeting/addStandardsFile","anon");//会员系统推送文件
         filterChainDefinitionMap.put("/meeting/payMeetingSituation/page2","anon");//查询参会人
+        filterChainDefinitionMap.put("/sys/user/payUserList","anon");//查询负责人
 
         filterChainDefinitionMap.put("/", "anon");
         filterChainDefinitionMap.put("/doc.html", "anon");
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 1731b3eb..2a83ec13 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -103,6 +103,9 @@ public class SysUserController {
     @Resource
     private BaseCommonService baseCommonService;
 
+    @Resource
+    private AuthenticationUtils authenticationUtils;
+
     /**
      * 根据角色id和部门id获取用户列表数据
      */
@@ -246,6 +249,43 @@ public class SysUserController {
         return result;
     }
 
+    @ApiOperation(value = "查询列表", notes = "查询列表")
+    @RequestMapping(value = "/payUserList", method = RequestMethod.GET)
+    public Result<?> queryList2(SysUser user, HttpServletRequest req) {
+        String publicKey = req.getParameter("publicKey");
+        String token = req.getParameter("token");
+        authenticationUtils.check(token,publicKey);
+        Result<List<SysUser>> result = new Result<>();
+        QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+        //TODO 外部模拟登陆临时账号，列表不显示
+        queryWrapper.ne("username","_reserve_user_external");
+        Page<SysUser> page = new Page<>(-1, -1);
+        IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
+        List<SysUser> userList = new ArrayList<>();
+        List<SysUser> records = pageList.getRecords();
+        for (SysUser record : records) {
+            //处理邮箱和手机号的加密
+            UserUtil.decryptUser(record);
+            userList.add(record);
+        }
+        pageList.setRecords(userList);
+        //批量查询用户的所属部门
+        //step.1 先拿到全部的 useids
+        //step.2 通过 useids，一次性查询用户的所属部门名字
+        List<String> userIds = records.stream().map(SysUser::getId).collect(Collectors.toList());
+        if(userIds!=null && userIds.size()>0){
+            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+            records.forEach(item->{
+                item.setOrgCodeTxt(useDepNames.get(item.getId()));
+            });
+        }
+        result.setSuccess(true);
+        result.setResult(records);
+        log.info(records.toString());
+        return result;
+    }
+
+
 
     //@RequiresRoles({"admin"})
     @RequiresPermissions("user:add")