diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java index 5e89a242..eb3d8d60 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java @@ -42,28 +42,28 @@ public class PaySpendingContractInstallment implements Serializable { @Size(max = 32, message = "合同id长度不能大于32个字符") private String contractId; /**阶段名称*/ - @Excel(name = "阶段名称", width = 15) + @Excel(name = "阶段", width = 15) @ApiModelProperty(value = "阶段名称") - @NotEmpty(message = "阶段长度不能为空") + @NotEmpty(message = "阶段不能为空") @Size(max = 50, message = "阶段长度不能大于50个字符") private String phaseName; /**应收金额*/ - @Excel(name = "应收金额", width = 15) + @Excel(name = "阶段应收金额", width = 15) @ApiModelProperty(value = "应收金额") - @NotNull(message = "应收金额不能为空") - @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") + @NotNull(message = "阶段应收不能为空") + @DecimalMax(value = "9999999999.99",message = "阶段应收格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal accountsReceivableAmount; /**应收时间*/ - @Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd") + @Excel(name = "阶段应收时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "应收时间") private Date accountsReceivableTime; /**实收金额*/ - @Excel(name = "实收金额", width = 15) - @ApiModelProperty(value = "实收金额") - @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") + @Excel(name = "阶段实收金额", width = 15) + @ApiModelProperty(value = "阶段实收金额") + @DecimalMax(value = "9999999999.99",message = "阶段实收格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; /**实收时间*/ 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 f2bb5dc6..2011b9a3 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 @@ -330,6 +330,12 @@ public class PaySpendingContractServiceImpl extends ServiceImpl 0){ @@ -342,9 +348,9 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listPaySpendingContractInstallment = new ArrayList<>(); Pattern pattern = Pattern.compile("[0-9]*\\.?[0-9]+"); for (int i = 0; i < count2; i++) { - if(StringUtils.isBlank(sub.get(listSpendingContract.size() + (i * 5)))){ - continue; - } +// if(StringUtils.isBlank(sub.get(listSpendingContract.size() + (i * 5)))){ +// continue; +// } int mm = listSpendingContract.size() + (i * listSpendingContractInstallment.size()); PaySpendingContractInstallment paySpendingContractInstallment = new PaySpendingContractInstallment(); paySpendingContractInstallment.setPhaseName(sub.get(mm)); @@ -376,6 +382,10 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listDBContractNum = paySpendingContractService.list(queryDBContractNum); // 获取excel负责人 List listDBPrincipalName = sysUserService.list(); - // 校验excel中是否存在重复合同编号 List listPaySpendingContract = new ArrayList<>(); listPaySpendingContractImportExcel.forEach(p->{ @@ -413,12 +422,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); } listPaySpendingContract.add(paySpendingContract); - if(!Objects.isNull(paySpendingContract)){ - StringBuilder msg = ValidUtil.validateExcel(paySpendingContract,n + 1); - if(!StringUtils.isBlank(msg)){ - sb.append(msg.toString()); - } - } + // 验证数据库中是否存在合同编号 if(!StringUtils.isBlank(paySpendingContract.getContractNum())){ // 获取数据库中数据 @@ -466,10 +470,6 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listPaySpendingContractInstallment = p.getListInstallment(); if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){ listPaySpendingContractInstallment.forEach(item->{ - StringBuilder msg = ValidUtil.validateExcel(item,n + 1); - if(!StringUtils.isBlank(msg)){ - sb.append(msg.toString()); - } int c = listPaySpendingContractInstallment.indexOf(item) + 1; if(!Objects.isNull(item.getAccountsReceivableAmount()) && !Objects.isNull(item.getPaidAmount()) && item.getAccountsReceivableAmount().compareTo(item.getPaidAmount()) < 0){