From 4c3e1d6ef032b93694eee8a6612ac443e16fa89c Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Thu, 7 Apr 2022 15:48:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=A7=93=E5=90=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/service/impl/PayIncomeContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 193f8d69..d955dbe0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -950,10 +950,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); From e9710d989a5602624dddcf43580f3771f5b6d372 Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Thu, 7 Apr 2022 17:24:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/PayIncomeContractCommon.java | 2 +- .../impl/PaySpendingContractServiceImpl.java | 72 +++++++++++-------- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java index 8ac923a1..0348c539 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java +++ b/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 LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人", - "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点", + "部门名称","签订合同总金额","税率","未税金额","联系电话","邮寄地址","邮编","合同签订日期","合同终止日期","合同约定主要时点", "应付金额","已付金额","未付金额","账款状态","合同约定付款次数"); /** * 支出合同分期信息excel 表头 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 b0b92460..b61c79cd 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 @@ -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 listPaySpendingContractInstallment = p.getListInstallment(); if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){ @@ -831,44 +830,59 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); + }else{ + paySpendingContract.setPhone(map.get(10)); + } + if(StringUtils.isBlank(map.get(11)) ){ + sb.append("第").append(n).append("行:邮寄地址不能为空，请修改。
"); + }else{ + paySpendingContract.setAddress(map.get(11)); + } + if(StringUtils.isBlank(map.get(12)) ){ + sb.append("第").append(n).append("行:邮编不能为空，请修改。
"); + }else{ + paySpendingContract.setPostCode(map.get(12)); + } + if(!StringUtils.isBlank(map.get(13)) ){ + if(!DateUtils.isValidDate(map.get(13))){ sb.append("第").append(n).append("行:合同签订日期格式不正确，请修改。
"); }else{ - paySpendingContract.setContractDate(DateUtils.str2Date(map.get(10),new SimpleDateFormat("yyyy-MM-dd"))); - } - } - if(!StringUtils.isBlank(map.get(11))){ - if(!DateUtils.isValidDate(map.get(11))) { - sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改。
"); - }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("行:应付金额格式错误，请修改。
"); - }else{ - paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(13))); + paySpendingContract.setContractDate(DateUtils.str2Date(map.get(13),new SimpleDateFormat("yyyy-MM-dd"))); } } if(!StringUtils.isBlank(map.get(14))){ - if(!pattern.matcher(map.get(14)).matches()){ - sb.append("第").append(n).append("行:已付金额格式错误，请修改。
"); + if(!DateUtils.isValidDate(map.get(14))) { + sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改。
"); }else{ - paySpendingContract.setAmountReceived(new BigDecimal(map.get(14))); + paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(14),new SimpleDateFormat("yyyy-MM-dd"))); } } - if(!StringUtils.isBlank(map.get(15))){ - if(!pattern.matcher(map.get(15)).matches()){ + paySpendingContract.setContractTimePoints(map.get(13)); + if(!StringUtils.isBlank(map.get(16))){ + if(!pattern.matcher(map.get(16)).matches()){ + sb.append("第").append(n).append("行:应付金额格式错误，请修改。
"); + }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("行:已付金额格式错误，请修改。
"); + }else{ + paySpendingContract.setAmountReceived(new BigDecimal(map.get(17))); + } + } + if(!StringUtils.isBlank(map.get(18))){ + if(!pattern.matcher(map.get(18)).matches()){ sb.append("第").append(n).append("行:未付金额格式错误，请修改。
"); }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; } From d34c0012fa371940fbaa2070767e78c752e126ce Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Thu, 7 Apr 2022 18:20:59 +0800 Subject: [PATCH 3/7] =?UTF-8?q?add=EF=BC=9A=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PaySpendingContractMapper.xml | 3 + .../controller/PayMailContractController.java | 96 ++++++++++--------- 2 files changed, 52 insertions(+), 47 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml index b4d9ff95..c6e3508d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml +++ b/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, 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 87b2b711..4e35ff0c 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 @@ -200,55 +200,57 @@ public class PayMailContractController extends JeroController map = new HashMap<>(); - map.put("contractName",payIncomeContract.getContractName()); - 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()); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); + if(payMailContract.getContractType()== PayIncomeContractCommon.CONTRACT_TYPE2) { + if (!Objects.isNull(payMailContract)) { + PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId()); + 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())) { + sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserInfo.getEmail())); + } + if (!org.apache.commons.lang3.StringUtils.isEmpty(sysUserInfo.getPhone())) { + sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserInfo.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("contractName", payIncomeContract.getContractName()); + 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()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); - // 发给合同的签订单位合同联系人 - SendMessageDTO sendMessageDTO1 = new SendMessageDTO(); - if (!StringUtils.isBlank(payMailContractData.getEmail())) { - sendMessageDTO1.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail())); + // 发给合同的签订单位合同联系人 + SendMessageDTO sendMessageDTO1 = new SendMessageDTO(); + if (!StringUtils.isBlank(payMailContractData.getEmail())) { + sendMessageDTO1.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail())); + } + if (!StringUtils.isBlank(payMailContractData.getMobile())) { + sendMessageDTO1.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile())); + sendMessageDTO1.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile())); + } + HashMap map1 = new HashMap<>(); + if (!Objects.isNull(payIncomeContract)) { + map1.put("contractName", payIncomeContract.getContractName()); + } + sendMessageDTO1.setFromUser(sysUser.getUsername()); + sendMessageDTO1.setTemplateCode(CompanyMessageEnums.MSG10.getCode()); + sendMessageDTO1.setTemplateParam(map1); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("id", payMailContract.getPostNo()); + sendMessageDTO1.setBusId(jsonObject.toJSONString()); + sendMessageDTO1.setBusType("C_OPEN_TYPE10"); + sendMessageService.SendMessageService(sendMessageDTO1); } - if (!StringUtils.isBlank(payMailContractData.getMobile())) { - sendMessageDTO1.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile())); - sendMessageDTO1.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile())); - } - HashMap map1 = new HashMap<>(); - if (!Objects.isNull(payIncomeContract)) { - map1.put("contractName", payIncomeContract.getContractName()); - } - sendMessageDTO1.setFromUser(sysUser.getUsername()); - sendMessageDTO1.setTemplateCode(CompanyMessageEnums.MSG10.getCode()); - sendMessageDTO1.setTemplateParam(map1); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("id",payMailContract.getPostNo()); - sendMessageDTO1.setBusId(jsonObject.toJSONString()); - sendMessageDTO1.setBusType("C_OPEN_TYPE10"); - sendMessageService.SendMessageService(sendMessageDTO1); } return Result.OK("操作成功!"); } From d66e618b0312564fef9735a89853026840f8ccba Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Fri, 8 Apr 2022 09:51:48 +0800 Subject: [PATCH 4/7] fix:bug --- .../service/impl/PaySpendingContractServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 b61c79cd..be1d1a67 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 @@ -593,6 +593,16 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listPaySpendingContractInstallment = p.getListInstallment(); if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){ listPaySpendingContractInstallment.forEach(item->{ From 8b96235c293616aa6cc1a6403c4b85be54bb5c64 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Fri, 8 Apr 2022 09:58:56 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=E5=90=88=E5=90=8Csql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2022-1-4变更.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index e556515e..e8be7b5c 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -47,6 +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); +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); From a2ed3fcfe55f65474de7b50cea4e9401a991a23b Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Fri, 8 Apr 2022 10:34:03 +0800 Subject: [PATCH 6/7] fix:bug --- .../controller/PrincipalPeopleStatisticsController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index 049419e6..3a69b301 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/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, "个人来款"); From 282af8c456c35b6fec16142c23e38c96ead74782 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Fri, 8 Apr 2022 11:50:00 +0800 Subject: [PATCH 7/7] fix:bug --- .../main/java/com/jero/mail/entity/PayMailContracrList.java | 1 + .../com/jero/project/entity/PayWorkingGroupStatistics.java | 4 ++-- .../java/com/jero/statistics/entity/CompanyComeMoneyList.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java index a0c740e0..10e2107f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java +++ b/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; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java index dce6cfd8..97649312 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java +++ b/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) - @ApiModelProperty(value = "完收完成率") + @Excel(name = "实收总金额", width = 15) + @ApiModelProperty(value = "实收总金额") private String moneyRate; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java index cd6bb8d9..2676d332 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java +++ b/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) - @ApiModelProperty(value = "实收完成率") + @Excel(name = "到账率", width = 15) + @ApiModelProperty(value = "到账率") private String finishRate; }