diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index 346da154..d9ca74bc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -105,6 +105,7 @@ public class PaySpendingContract implements Serializable { @Excel(name = "税率", width = 15) @ApiModelProperty(value = "税率") @NotNull(message = "税率不能为空!") + @DecimalMax(value = "9999999999.99",message = "税率格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal rate; /**未税金额*/ @@ -112,6 +113,7 @@ public class PaySpendingContract implements Serializable { @ApiModelProperty(value = "未税金额") @NotNull(message = "未税金额不能为空!") @JsonFormat(shape = JsonFormat.Shape.STRING) + @DecimalMax(value = "9999999999.99",message = "未税金额格式错误") private BigDecimal noTaxAmount; /**合同签订日期*/ @Excel(name = "合同签订日期", width = 15, format = "yyyy-MM-dd") @@ -135,17 +137,20 @@ public class PaySpendingContract implements Serializable { @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空!") @JsonFormat(shape = JsonFormat.Shape.STRING) + @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") private BigDecimal accountsReceivableAmount; /**已收金额*/ @Excel(name = "已收金额", width = 15) @ApiModelProperty(value = "已收金额") @NotNull(message = "已收金额不能为空!") @JsonFormat(shape = JsonFormat.Shape.STRING) + @DecimalMax(value = "9999999999.99",message = "已收金额格式错误") private BigDecimal amountReceived; /**未收金额*/ @Excel(name = "未收金额", width = 15) @ApiModelProperty(value = "未收金额") @JsonFormat(shape = JsonFormat.Shape.STRING) + @DecimalMax(value = "9999999999.99",message = "未收金额格式错误") private BigDecimal outstandingAmount; /**账款状态(1:未支付,2:部分支付,3:已付全款)*/ @Excel(name = "账款状态(1:未支付,2:部分支付,3:已付全款)", width = 15) 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 ac12af93..10a0c9d9 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 @@ -323,7 +323,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); }else{ paySpendingContractInstallment.setAccountsReceivableAmount(new BigDecimal(sub.get(mm + 1))); } @@ -337,7 +337,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); }else{ paySpendingContractInstallment.setPaidAmount(new BigDecimal(sub.get(mm + 3))); } @@ -383,7 +383,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listPaySpendingContractNew = listPaySpendingContract.stream().filter(item-> Objects.equals(item.getContractNum(),paySpendingContract.getContractNum())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listPaySpendingContractNew)){ - sb.append("第").append(n + 1).append("行,合同编号在excel中重复,请修改!"); + sb.append("第").append(n + 1).append("行,合同编号在excel中重复,请修改!
"); } listPaySpendingContract.add(paySpendingContract); if(!Objects.isNull(paySpendingContract)){ @@ -398,40 +398,40 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listDB = listDBContractNum.stream().filter(item-> Objects.equals(item.getContractNum(),paySpendingContract.getContractNum())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listDB)){ - sb.append("第").append(n + 1).append("行,合同编号已存在,请修改!"); + sb.append("第").append(n + 1).append("行,合同编号已存在,请修改!
"); } }else{ - sb.append("第").append(n + 1).append("行,合同编号不能为空,请修改!"); + sb.append("第").append(n + 1).append("行,合同编号不能为空,请修改!
"); } // 验证数据库中是否存在负责人 if(!StringUtils.isBlank(paySpendingContract.getContractName())){ List listDB = listDBPrincipalName.stream().filter(item-> Objects.equals(item.getRealname(),paySpendingContract.getPrincipalName())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listDB)){ - sb.append("第").append(n + 1).append("行,负责人不存在,请修改!"); + sb.append("第").append(n + 1).append("行,负责人不存在,请修改!
"); }else{ paySpendingContract.setPrincipalId(listDB.get(0).getId()); // 验证数据库中是否存在部门名称 Map useDepNames = sysUserService.getDepNamesByUserIds(Collections.singletonList(listDB.get(0).getId())); if(!Objects.isNull(useDepNames)){ if(!Objects.equals(useDepNames.get(listDB.get(0).getId()),paySpendingContract.getDepartmentName())){ - sb.append("第").append(n + 1).append("行,部门名称不存在,请修改!"); + sb.append("第").append(n + 1).append("行,部门名称不存在,请修改!
"); }else{ paySpendingContract.setDepartmentName(useDepNames.get(listDB.get(0).getId())); } }else{ - sb.append("第").append(n + 1).append("行,部门名称不存在,请修改!"); + sb.append("第").append(n + 1).append("行,部门名称不存在,请修改!
"); } } }else{ - sb.append("第").append(n + 1).append("行,负责人不能为空,请修改!"); + sb.append("第").append(n + 1).append("行,负责人不能为空,请修改!
"); } if(!Objects.isNull(paySpendingContract.getPack()) && Objects.equals(paySpendingContract.getPack(),PayIncomeContractCommon.PACK1) && StringUtils.isBlank(paySpendingContract.getPackYear())){ - sb.append("第").append(n + 1).append("行,打包年份不能为空,请修改!"); + sb.append("第").append(n + 1).append("行,打包年份不能为空,请修改!
"); } if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived()) && paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){ - sb.append("第").append(n + 1).append("行,应收金额大于已收金额,请修改!"); + sb.append("第").append(n + 1).append("行,应收金额大于已收金额,请修改!
"); } List listPaySpendingContractInstallment = p.getListInstallment(); if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){ @@ -439,7 +439,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); } StringBuilder msg = ValidUtil.validateExcel(item,n + 1); if(!StringUtils.isBlank(msg)){ @@ -514,21 +514,21 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); }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))); } @@ -550,14 +550,14 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); }else{ paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(12))); } } if(!StringUtils.isBlank(map.get(13))){ if(!pattern.matcher(map.get(13)).matches()){ - sb.append("第").append(n).append("行,已收金额格式错误!"); + sb.append("第").append(n).append("行,已收金额格式错误!
"); }else{ paySpendingContract.setAmountReceived(new BigDecimal(map.get(13))); }