Merge remote-tracking branch 'origin/branch2022-1-4' into branch2022-1-4

# Conflicts:
#	db/2022-1-4变更.sql

db/2022-1-4变更.sql

@@ -47,130 +47,9 @@ update tb_certificate_payment set charge_use = 20 where 1 = 1;
 
 update pay_meeting set meeting_type = 5 ,case_committee_id = '1486586847797346305' ,case_committee_name = '全国汽车标准化技术委员会电动车辆分技术委员会' WHERE id = '1478574801809993729';
 update pay_working_group_subitem set make_invoice = 1 where id = '1484760196725768194';
-
+--合同变更
 alter TABLE pay_spending_contract ADD (phone VARCHAR(22) COMMENT '联系电话',address VARCHAR(255) COMMENT '邮寄地址',post_code VARCHAR(50) COMMENT '邮编');
 alter TABLE pay_mail_contract ADD (contract_type TINYINT(2) COMMENT '合同类型：1 支出合同，2 收入合同');
-
+INSERT INTO `sys_dict` VALUES ('1509830472616779778', '合同类型', 'contract_type', '（1：支出合同，2：收入合同）', 0, 'LKGLZ', '2022-04-01 17:50:11', 'LKGLZ', '2022-04-01 17:51:38', 0);
--- 2022-4-8 导入工号
+INSERT INTO `sys_dict_item` VALUES ('1509830576870400001', '1509830472616779778', '支出合同', '1', '', 1.00, 1, 'LKGLZ', '2022-04-01 17:50:35', NULL, NULL);
-/*
+INSERT INTO `sys_dict_item` VALUES ('1509830618775691265', '1509830472616779778', '收入合同', '2', '', 1.00, 1, 'LKGLZ', '2022-04-01 17:50:45', NULL, NULL);
- Navicat Premium Data Transfer
-
- Source Server         : 10.10.10.44
- Source Server Type    : MySQL
- Source Server Version : 50711
- Source Host           : 10.10.10.44:3306
- Source Schema         : income_payments
-
- Target Server Type    : MySQL
- Target Server Version : 50711
- File Encoding         : 65001
-
- Date: 08/04/2022 14:33:40
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for sheet0
--- ----------------------------
-DROP TABLE IF EXISTS `sheet0`;
-CREATE TABLE `sheet0`  (
-                           `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-                           `fullname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of sheet0
--- ----------------------------
-INSERT INTO `sheet0` VALUES ('06779', '闫雪');
-INSERT INTO `sheet0` VALUES ('01633', '陈强');
-INSERT INTO `sheet0` VALUES ('05085', '纪梦雪');
-INSERT INTO `sheet0` VALUES ('02939', '解瀚光');
-INSERT INTO `sheet0` VALUES ('05090', '孙悦');
-INSERT INTO `sheet0` VALUES ('05095', '张清莹');
-INSERT INTO `sheet0` VALUES ('05524', '王彪');
-INSERT INTO `sheet0` VALUES ('04172', '赵静炜');
-INSERT INTO `sheet0` VALUES ('00067', '王兆');
-INSERT INTO `sheet0` VALUES ('00084', '戎辉');
-INSERT INTO `sheet0` VALUES ('00066', '刘桂彬');
-INSERT INTO `sheet0` VALUES ('01433', '傅剑华');
-INSERT INTO `sheet0` VALUES ('01107', '李维菁');
-INSERT INTO `sheet0` VALUES ('01505', '张英男');
-INSERT INTO `sheet0` VALUES ('05536', '张昊');
-INSERT INTO `sheet0` VALUES ('05532', '闫志强');
-INSERT INTO `sheet0` VALUES ('05511', '郭琳');
-INSERT INTO `sheet0` VALUES ('01627', '李琛');
-INSERT INTO `sheet0` VALUES ('03054', '王一鸣');
-INSERT INTO `sheet0` VALUES ('01133', '孙枝鹏');
-INSERT INTO `sheet0` VALUES ('05817', '李玉刚');
-INSERT INTO `sheet0` VALUES ('05755', '常晏宁');
-INSERT INTO `sheet0` VALUES ('05530', '许天楚');
-INSERT INTO `sheet0` VALUES ('05518', '刘静榕');
-INSERT INTO `sheet0` VALUES ('05089', '彭伟强');
-INSERT INTO `sheet0` VALUES ('04770', '曹丽娟');
-INSERT INTO `sheet0` VALUES ('04235', '田富刚');
-INSERT INTO `sheet0` VALUES ('01877', '张铜柱');
-INSERT INTO `sheet0` VALUES ('01557', '张广秀');
-INSERT INTO `sheet0` VALUES ('01140', '轩轶');
-INSERT INTO `sheet0` VALUES ('01134', '孙振东');
-INSERT INTO `sheet0` VALUES ('01003', '刘彦戎');
-INSERT INTO `sheet0` VALUES ('01150', '朱彤');
-INSERT INTO `sheet0` VALUES ('05515', '李铮');
-INSERT INTO `sheet0` VALUES ('05509', '付越');
-INSERT INTO `sheet0` VALUES ('04238', '季国田');
-INSERT INTO `sheet0` VALUES ('03840', '胡月');
-INSERT INTO `sheet0` VALUES ('01821', '李波');
-INSERT INTO `sheet0` VALUES ('01470', '范嘉睿');
-INSERT INTO `sheet0` VALUES ('01181', '刘地');
-INSERT INTO `sheet0` VALUES ('04670', '文清浩');
-INSERT INTO `sheet0` VALUES ('02343', '潘俊家');
-INSERT INTO `sheet0` VALUES ('01162', '郭淼');
-INSERT INTO `sheet0` VALUES ('02256', '殷凤轩');
-INSERT INTO `sheet0` VALUES ('05586', '何丽');
-INSERT INTO `sheet0` VALUES ('05525', '王惠云');
-INSERT INTO `sheet0` VALUES ('05517', '刘佳仪');
-INSERT INTO `sheet0` VALUES ('05508', '董坤');
-INSERT INTO `sheet0` VALUES ('02141', '李金玉');
-INSERT INTO `sheet0` VALUES ('01513', '张翠');
-INSERT INTO `sheet0` VALUES ('01183', '杨振馨');
-INSERT INTO `sheet0` VALUES ('01166', '孙怡');
-INSERT INTO `sheet0` VALUES ('01047', '骆志红');
-INSERT INTO `sheet0` VALUES ('01064', '朱毅');
-INSERT INTO `sheet0` VALUES ('01525', '李稳');
-INSERT INTO `sheet0` VALUES ('01546', '郑天雷');
-INSERT INTO `sheet0` VALUES ('01726', '于洋');
-INSERT INTO `sheet0` VALUES ('05387', '郝维健');
-INSERT INTO `sheet0` VALUES ('05522', '刘志超');
-INSERT INTO `sheet0` VALUES ('05505', '曹冬冬');
-INSERT INTO `sheet0` VALUES ('03871', '胡建');
-INSERT INTO `sheet0` VALUES ('02997', '兰昊');
-INSERT INTO `sheet0` VALUES ('01671', '徐枭');
-INSERT INTO `sheet0` VALUES ('01665', '保翔');
-INSERT INTO `sheet0` VALUES ('01061', '何云堂');
-INSERT INTO `sheet0` VALUES ('04202', '柳邵辉');
-INSERT INTO `sheet0` VALUES ('02704', '孙航');
-INSERT INTO `sheet0` VALUES ('06716', '吴嘉杰');
-INSERT INTO `sheet0` VALUES ('05709', '张路');
-INSERT INTO `sheet0` VALUES ('03206', '张淼');
-INSERT INTO `sheet0` VALUES ('02662', '吴含冰');
-INSERT INTO `sheet0` VALUES ('05514', '李宝田');
-INSERT INTO `sheet0` VALUES ('05507', '陈振宇');
-INSERT INTO `sheet0` VALUES ('04346', '张行');
-INSERT INTO `sheet0` VALUES ('04922', '李春');
-INSERT INTO `sheet0` VALUES ('02944', '张琳琳');
-INSERT INTO `sheet0` VALUES ('04674', '陆春');
-INSERT INTO `sheet0` VALUES ('05535', '张春荣');
-INSERT INTO `sheet0` VALUES ('05533', '燕翙江');
-INSERT INTO `sheet0` VALUES ('05087', '李云伟');
-INSERT INTO `sheet0` VALUES ('01083', '王颖');
-INSERT INTO `sheet0` VALUES ('04393', '魏墨晗');
-INSERT INTO `sheet0` VALUES ('03741', '吕双');
-INSERT INTO `sheet0` VALUES ('02377', '冯博');
-INSERT INTO `sheet0` VALUES ('01432', '谢东明');
-
-SET FOREIGN_KEY_CHECKS = 1;
-
-update sys_user set sys_user.work_no = (select sheet0.username from sheet0 where sys_user.realname = sheet0.fullname)
-
-DROP TABLE IF EXISTS `sheet0`;

jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java

@@ -87,7 +87,7 @@ public class PayIncomeContractCommon {
      * 支出合同excel表头
      */
     public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人",
-            "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点",
+            "部门名称","签订合同总金额","税率","未税金额","联系电话","邮寄地址","邮编","合同签订日期","合同终止日期","合同约定主要时点",
             "应付金额","已付金额","未付金额","账款状态","合同约定付款次数");
     /**
      * 支出合同分期信息excel 表头

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

@@ -89,6 +89,9 @@
         department_name,
         contract_amount,
         rate,
+        phone,
+        address,
+        post_code,
         no_tax_amount,
         contract_date,
         termination_date,

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -950,10 +950,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
             if(!Objects.isNull(payContactsManagementTemporary)){
                 payMailContract.setMobile(payContactsManagementTemporary.getPhone());
                 payMailContract.setEmail(payContactsManagementTemporary.getEmail());
+                payMailContract.setLiaisonMan(payContactsManagementTemporary.getName());
             }
             payMailContract.setContractId(payIncomeContractStatus.getId());
             payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
-            payMailContract.setLiaisonMan(payIncomeContractStatus.getContractName());
             payMailContractService.save(payMailContract);
             // 获取项目负责人，发送消息
             List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java

@@ -18,7 +18,6 @@ import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.contract.common.PayIncomeContractCommon;
-import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.entity.PaySpendingContract;
 import com.jero.contract.entity.PaySpendingContractAudit;
 import com.jero.contract.entity.PaySpendingContractInstallment;
@@ -32,7 +31,6 @@ import com.jero.mail.entity.PayMailContract;
 import com.jero.mail.service.IPayMailContractService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -44,6 +42,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
@@ -299,7 +298,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
             if (Objects.isNull(principalName)) {
                 throw new JeroBootException("负责人名称为空！");
             }
-            paySpendingContract.setStatus(PayIncomeContractCommon.STATUS2);
+            paySpendingContract.setStatus(PayIncomeContractCommon.STATUS3);
             paySpendingContract.setPrincipalId(principalName.getId());
             paySpendingContract.setPrincipalName(principalName.getRealname());
             paySpendingContractService.updateById(paySpendingContract);
@@ -592,8 +591,18 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                         }
                         paySpendingContract.setPrincipalId(principalName.getId());
                         paySpendingContract.setPrincipalName(principalName.getRealname());
-                        paySpendingContract.setStatus(PayIncomeContractCommon.STATUS2);
+                        paySpendingContract.setStatus(PayIncomeContractCommon.STATUS3);
                         paySpendingContractService.save(paySpendingContract);
+                        // 更新到合同邮寄表
+                        PayMailContract payMailContract = new PayMailContract();
+                        payMailContract.setContractId(paySpendingContract.getId());
+                        payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
+                        payMailContract.setMobile(PasswordUtil.encrypt(paySpendingContract.getPhone()));
+                        payMailContract.setEmail("");
+                        payMailContract.setLiaisonMan(paySpendingContract.getSignedContactsTemporaryName());
+                        payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE1);
+
+                        payMailContractService.save(payMailContract);
                         List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
                         if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
                             listPaySpendingContractInstallment.forEach(item->{
@@ -831,44 +840,59 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
                 paySpendingContract.setNoTaxAmount(new BigDecimal(map.get(9)));
             }
         }
-        if(!StringUtils.isBlank(map.get(10)) ){
+        if(StringUtils.isBlank(map.get(10)) ){
-            if(!DateUtils.isValidDate(map.get(10))){
+            sb.append("第").append(n).append("行:联系电话不能为空，请修改。<br/>");
+        }else{
+            paySpendingContract.setPhone(map.get(10));
+        }
+        if(StringUtils.isBlank(map.get(11)) ){
+            sb.append("第").append(n).append("行:邮寄地址不能为空，请修改。<br/>");
+        }else{
+            paySpendingContract.setAddress(map.get(11));
+        }
+        if(StringUtils.isBlank(map.get(12)) ){
+            sb.append("第").append(n).append("行:邮编不能为空，请修改。<br/>");
+        }else{
+            paySpendingContract.setPostCode(map.get(12));
+        }
+        if(!StringUtils.isBlank(map.get(13)) ){
+            if(!DateUtils.isValidDate(map.get(13))){
                 sb.append("第").append(n).append("行:合同签订日期格式不正确，请修改。<br/>");
             }else{
-                paySpendingContract.setContractDate(DateUtils.str2Date(map.get(10),new SimpleDateFormat("yyyy-MM-dd")));
+                paySpendingContract.setContractDate(DateUtils.str2Date(map.get(13),new SimpleDateFormat("yyyy-MM-dd")));
-            }
-        }
-        if(!StringUtils.isBlank(map.get(11))){
-            if(!DateUtils.isValidDate(map.get(11))) {
-                sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改。<br/>");
-            }else{
-                paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(11),new SimpleDateFormat("yyyy-MM-dd")));
-            }
-        }
-        paySpendingContract.setContractTimePoints(map.get(13));
-        if(!StringUtils.isBlank(map.get(13))){
-            if(!pattern.matcher(map.get(13)).matches()){
-                sb.append("第").append(n).append("行:应付金额格式错误，请修改。<br/>");
-            }else{
-                paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(13)));
             }
         }
         if(!StringUtils.isBlank(map.get(14))){
-            if(!pattern.matcher(map.get(14)).matches()){
+            if(!DateUtils.isValidDate(map.get(14))) {
+                sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改。<br/>");
+            }else{
+                paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(14),new SimpleDateFormat("yyyy-MM-dd")));
+            }
+        }
+        paySpendingContract.setContractTimePoints(map.get(13));
+        if(!StringUtils.isBlank(map.get(16))){
+            if(!pattern.matcher(map.get(16)).matches()){
+                sb.append("第").append(n).append("行:应付金额格式错误，请修改。<br/>");
+            }else{
+                paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(16)));
+            }
+        }
+        if(!StringUtils.isBlank(map.get(17))){
+            if(!pattern.matcher(map.get(17)).matches()){
                 sb.append("第").append(n).append("行:已付金额格式错误，请修改。<br/>");
             }else{
-                paySpendingContract.setAmountReceived(new BigDecimal(map.get(14)));
+                paySpendingContract.setAmountReceived(new BigDecimal(map.get(17)));
             }
         }
-        if(!StringUtils.isBlank(map.get(15))){
+        if(!StringUtils.isBlank(map.get(18))){
-            if(!pattern.matcher(map.get(15)).matches()){
+            if(!pattern.matcher(map.get(18)).matches()){
                 sb.append("第").append(n).append("行:未付金额格式错误，请修改。<br/>");
             }else{
-                paySpendingContract.setOutstandingAmount(new BigDecimal(map.get(15)));
+                paySpendingContract.setOutstandingAmount(new BigDecimal(map.get(18)));
             }
         }
 
-        paySpendingContract.setContractPaymentTimes(map.get(17));
+        paySpendingContract.setContractPaymentTimes(map.get(20));
         return paySpendingContract;
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java

@@ -200,31 +200,32 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 		 payMailContract.setPostStatus(1);
 		 payMailContract.setMobile(PasswordUtil.encrypt(payMailContract.getMobile()));
 		 payMailContractService.updateById(payMailContract);
+		 if(payMailContract.getContractType()== PayIncomeContractCommon.CONTRACT_TYPE2) {
 			 if (!Objects.isNull(payMailContract)) {
 				 PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
-			 if(Objects.isNull(payIncomeContract)){
+				 if (Objects.isNull(payIncomeContract)) {
 					 throw new JeroBootException("合同不存在！");
 				 }
 				 // 发给 合同负责人
 				 SysUser sysUserInfo = sysUserService.getById(payIncomeContract.getPrincipalId());
 				 // 发送消息
 				 SendMessageDTO sendMessageDTO = new SendMessageDTO();
-			 if(!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())){
+				 if (!org.apache.commons.lang3.StringUtils.isBlank(sysUserInfo.getEmail())) {
 					 sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail()));
 				 }
-			 if(!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())){
+				 if (!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())) {
 					 sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone()));
 				 }
-			 HashMap<String,String> map = new HashMap<>();
+				 HashMap<String, String> map = new HashMap<>();
-			 map.put("contractName",payIncomeContract.getContractName());
+				 map.put("contractName", payIncomeContract.getContractName());
-			 map.put("contractNum",payIncomeContract.getContractNum());
+				 map.put("contractNum", payIncomeContract.getContractNum());
 				 sendMessageDTO.setFromUser(sysUser.getUsername());
 				 sendMessageDTO.setToUser(sysUserInfo.getUsername());
 				 sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG14.getCode());
 				 sendMessageDTO.setTemplateParam(map);
 				 sendMessageDTO.setBusType("M_OPEN_TYPE14");
 				 JSONObject json = new JSONObject();
-			 json.put("id",payMailContract.getPostNo());
+				 json.put("id", payMailContract.getPostNo());
 				 sendMessageDTO.setBusId(json.toJSONString());
 				 sendMessageService.SendMessageService(sendMessageDTO);
 
@@ -245,11 +246,12 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 				 sendMessageDTO1.setTemplateCode(CompanyMessageEnums.MSG10.getCode());
 				 sendMessageDTO1.setTemplateParam(map1);
 				 JSONObject jsonObject = new JSONObject();
-			 jsonObject.put("id",payMailContract.getPostNo());
+				 jsonObject.put("id", payMailContract.getPostNo());
 				 sendMessageDTO1.setBusId(jsonObject.toJSONString());
 				 sendMessageDTO1.setBusType("C_OPEN_TYPE10");
 				 sendMessageService.SendMessageService(sendMessageDTO1);
 			 }
+		 }
 		 return Result.OK("操作成功!");
 	 }
 

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java

@@ -61,6 +61,7 @@ public class PayMailContracrList {
     @ApiModelProperty(value = "邮寄联系人地址")
     private java.lang.String contactAddress;
     @Dict(dicCode ="contract_type")
+    @Excel(name = "合同类型", width = 15,dicCode = "contract_type")
     @ApiModelProperty(value = "合同类型")
     private java.lang.String contractType;
 

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java

@@ -25,8 +25,8 @@ public class PayWorkingGroupStatistics {
     @Excel(name = "实收总金额", width = 15)
     @ApiModelProperty(value = "实收总金额")
     private String comeAllMoney;
-    @Excel(name = "完收完成率", width = 15)
+    @Excel(name = "实收总金额", width = 15)
-    @ApiModelProperty(value = "完收完成率")
+    @ApiModelProperty(value = "实收总金额")
     private String moneyRate;
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java

@@ -218,6 +218,9 @@ public class PrincipalPeopleStatisticsController {
                 if (s.getComeAllMoney() == null || s.getComeAllMoney().equals("")) {
                     s.setComeAllMoney("0.00");
                 }
+                if(s.getFinishRate() == null || s.getFinishRate().equals("")){
+                    s.setFinishRate("0.00%");
+                }
 
             }
             return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "个人来款");

jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java

@@ -25,7 +25,7 @@ public class CompanyComeMoneyList {
     @Excel(name = "实收总金额", width = 15)
     @ApiModelProperty(value = "实收总金额")
     private String comeAllMoney;
-    @Excel(name = "实收完成率", width = 15)
+    @Excel(name = "到账率", width = 15)
-    @ApiModelProperty(value = "实收完成率")
+    @ApiModelProperty(value = "到账率")
     private String finishRate;
 }