From 1dd84eddac0f49e768958304893076195a054433 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, 21 Oct 2021 10:36:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41007?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/util/ValidUtil.java | 2 +- .../common/PayIncomeContractCommon.java | 2 +- .../PayIncomeContractController.java | 8 ++--- .../PaySpendingContractController.java | 8 ++--- .../impl/PaySpendingContractServiceImpl.java | 35 +++++++++---------- .../vo/PaySpendingContractExcelModel.java | 16 ++++----- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java index 4e09654f..4c13b46c 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java @@ -99,7 +99,7 @@ public class ValidUtil { if(set != null && set.size() > 0 ){ for(ConstraintViolation constraintViolation : set){ // 这里循环获取错误信息，可以自定义格式 - msg.append("第").append(count).append("行:").append(constraintViolation.getMessage()).append("
"); + msg.append("第").append(count).append("行:").append(constraintViolation.getMessage()).append("，请修改！
"); } } return msg; 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 63d649a2..ff059009 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 @@ -84,7 +84,7 @@ public class PayIncomeContractCommon { /** * 支出合同分期信息excel 表头 */ - public final static List LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","期应收","期应收时间","期实收","期实收时间"); + public final static List LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应收","阶段应收时间","阶段实收","阶段实收时间"); /** * 来源（1:收入合同,2:打包管理） diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 4133f545..3f1ecf2e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -617,10 +617,10 @@ public class PayIncomeContractController extends JeroController 0){ for (int i = 1; i <= count; i++){ filedsList.add(new ExcelExportEntity(i + "阶段", "phaseName" + i)); - filedsList.add(new ExcelExportEntity(i + "期应收", "accountsReceivableAmount" + i)); - filedsList.add(new ExcelExportEntity(i + "期应收时间", "accountsReceivableTime" + i)); - filedsList.add(new ExcelExportEntity(i + "期实收", "paidAmount" + i)); - filedsList.add(new ExcelExportEntity(i + "期实收时间", "paidTime" + i)); + filedsList.add(new ExcelExportEntity(i + "阶段应收", "accountsReceivableAmount" + i)); + filedsList.add(new ExcelExportEntity(i + "阶段应收时间", "accountsReceivableTime" + i)); + filedsList.add(new ExcelExportEntity(i + "阶段实收", "paidAmount" + i)); + filedsList.add(new ExcelExportEntity(i + "阶段实收时间", "paidTime" + i)); } } // Step.3 AutoPoi 导出Excel diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index 9f4b992c..e6b91b42 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -340,10 +340,10 @@ public class PaySpendingContractController extends JeroController 0){ for (int i = 1; i <= count; i++){ filedsList.add(new ExcelExportEntity(i + "阶段", "phaseName" + i)); - filedsList.add(new ExcelExportEntity(i + "期应收", "accountsReceivableAmount" + i)); - filedsList.add(new ExcelExportEntity(i + "期应收时间", "accountsReceivableTime" + i)); - filedsList.add(new ExcelExportEntity(i + "期实收", "paidAmount" + i)); - filedsList.add(new ExcelExportEntity(i + "期实收时间", "paidTime" + i)); + filedsList.add(new ExcelExportEntity(i + "阶段应收", "accountsReceivableAmount" + i)); + filedsList.add(new ExcelExportEntity(i + "阶段应收时间", "accountsReceivableTime" + i)); + filedsList.add(new ExcelExportEntity(i + "阶段实收", "paidAmount" + i)); + filedsList.add(new ExcelExportEntity(i + "阶段实收时间", "paidTime" + i)); } } // Step.3 AutoPoi 导出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 3114be8a..f2bb5dc6 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 @@ -307,7 +307,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl{ int n = listSpendingContractInstallment.indexOf(item) + 1; if(Objects.equals((n + 1) + item,map.get(listSpendingContract.size() + finalI * n))){ - throw new JeroBootException("导入的！" + n + "期阶段excel表头有误！"); + throw new JeroBootException("导入的！" + n + "阶段excel表头有误！"); } }); } @@ -350,28 +350,28 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); + sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段应收格式错误，请修改！
"); }else{ paySpendingContractInstallment.setAccountsReceivableAmount(new BigDecimal(sub.get(mm + 1))); } } if(!StringUtils.isBlank(sub.get(mm + 2))){ if(!DateUtils.isValidDate(sub.get(mm + 2))){ - sb.append("第").append(n + 1).append("行:").append(i+1).append("期应收时间日期格式不正确
"); + sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段应收时间日期格式不正确，请修改！
"); }else{ paySpendingContractInstallment.setAccountsReceivableTime(DateUtils.str2Date(sub.get(mm + 2),new SimpleDateFormat("yyyy-MM-dd"))); } } if(!StringUtils.isBlank(sub.get(mm + 3))){ if(!pattern.matcher(sub.get(mm + 3)).matches()){ - sb.append("第").append(n + 1).append("行:").append(i+1).append("期实收金额格式错误！
"); + sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段实收格式错误，请修改！
"); }else{ paySpendingContractInstallment.setPaidAmount(new BigDecimal(sub.get(mm + 3))); } } if(!StringUtils.isBlank(sub.get(mm + 4))) { if (!DateUtils.isValidDate(sub.get(mm + 4))) { - sb.append("第").append(n + 1).append("行:").append(i+1).append("期实收时间日期格式不正确
"); + sb.append("第").append(n + 1).append("行:").append(i+1).append("阶段实收时间日期格式不正确，请修改
"); } else { paySpendingContractInstallment.setPaidTime(DateUtils.str2Date(sub.get(mm + 4), new SimpleDateFormat("yyyy-MM-dd"))); } @@ -459,8 +459,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); - } - if(!Objects.isNull(paySpendingContract.getOutstandingAmount()) && paySpendingContract.getAccountsReceivableAmount().subtract(paySpendingContract.getAmountReceived()).compareTo(paySpendingContract.getOutstandingAmount()) != 0){ + }else if(!Objects.isNull(paySpendingContract.getOutstandingAmount()) && paySpendingContract.getAccountsReceivableAmount().subtract(paySpendingContract.getAmountReceived()).compareTo(paySpendingContract.getOutstandingAmount()) != 0){ sb.append("第").append(n + 1).append("行:未收金额不正确，请修改！
"); } } @@ -474,7 +473,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); + sb.append("第").append(n + 1).append("行:").append(c).append("阶段实收大于应收，请修改！
"); } }); } @@ -500,7 +499,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); + sb.append("第").append(n).append("行:是否开口格式错误，请修改！
"); }else{ mapOpening.forEach((k,v)->{ if(Objects.equals(map.get(4),k)){ @@ -550,35 +549,35 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); + sb.append("第").append(n).append("行:签订合同总金额格式错误，请修改！
"); }else{ paySpendingContract.setContractAmount(new BigDecimal(map.get(7))); } } if(!StringUtils.isBlank(map.get(8))){ if(!pattern.matcher(map.get(8)).matches()){ - sb.append("第").append(n).append("行:税率格式错误！
"); + sb.append("第").append(n).append("行:税率格式错误，请修改！
"); }else{ paySpendingContract.setRate(new BigDecimal(map.get(8))); } } if(!StringUtils.isBlank(map.get(9)) ){ if(!pattern.matcher(map.get(9)).matches()){ - sb.append("第").append(n).append("行:未税金额格式错误！
"); + sb.append("第").append(n).append("行:未税金额格式错误，请修改！
"); }else{ paySpendingContract.setNoTaxAmount(new BigDecimal(map.get(9))); } } if(!StringUtils.isBlank(map.get(10)) ){ if(!DateUtils.isValidDate(map.get(10))){ - sb.append("第").append(n).append("行:合同签订日期格式不正确
"); + 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("行:合同终止日期格式不正确
"); + sb.append("第").append(n).append("行:合同终止日期格式不正确，请修改！
"); }else{ paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(11),new SimpleDateFormat("yyyy-MM-dd"))); } @@ -586,21 +585,21 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); + sb.append("第").append(n).append("行:应收金额格式错误，请修改！
"); }else{ paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(13))); } } if(!StringUtils.isBlank(map.get(14))){ if(!pattern.matcher(map.get(14)).matches()){ - sb.append("第").append(n).append("行:已收金额格式错误！
"); + sb.append("第").append(n).append("行:已收金额格式错误，请修改！
"); }else{ paySpendingContract.setAmountReceived(new BigDecimal(map.get(14))); } } if(!StringUtils.isBlank(map.get(15))){ if(!pattern.matcher(map.get(15)).matches()){ - sb.append("第").append(n).append("行:未收金额格式错误！
"); + sb.append("第").append(n).append("行:未收金额格式错误，请修改！
"); }else{ paySpendingContract.setOutstandingAmount(new BigDecimal(map.get(15))); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java index e38398f0..2d266d84 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java @@ -72,30 +72,30 @@ public class PaySpendingContractExcelModel implements Serializable { @Excel(name = "1阶段", width = 15) private String phaseName1; /**应收金额*/ - @Excel(name = "1期应收", width = 15) + @Excel(name = "1阶段应收", width = 15) private Integer accountsReceivableAmount1; /**应收时间*/ - @Excel(name = "1期应收时间", width = 15, format = "yyyy-MM-dd") + @Excel(name = "1阶段应收时间", width = 15, format = "yyyy-MM-dd") private Date accountsReceivableTime1; /**实收金额*/ - @Excel(name = "1期实收", width = 15) + @Excel(name = "1阶段实收", width = 15) private Integer paidAmount1; /**实收时间*/ - @Excel(name = "1期实收时间", width = 15, format = "yyyy-MM-dd") + @Excel(name = "1阶段实收时间", width = 15, format = "yyyy-MM-dd") private Date paidTime1; /**阶段名称*/ @Excel(name = "2阶段", width = 15) private String phaseName2; /**应收金额*/ - @Excel(name = "2期应收", width = 15) + @Excel(name = "2阶段应收", width = 15) private Integer accountsReceivableAmount2; /**应收时间*/ - @Excel(name = "2期应收时间", width = 15, format = "yyyy-MM-dd") + @Excel(name = "2阶段应收时间", width = 15, format = "yyyy-MM-dd") private Date accountsReceivableTime2; /**实收金额*/ - @Excel(name = "2期实收", width = 15) + @Excel(name = "2阶段实收", width = 15) private Integer paidAmount2; /**实收时间*/ - @Excel(name = "2期实收时间", width = 15, format = "yyyy-MM-dd") + @Excel(name = "2阶段实收时间", width = 15, format = "yyyy-MM-dd") private Date paidTime2; }