LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug#41000

Browse Source
This commit is contained in:
梁琦涛
2021-10-21 14:19:41 +08:00
parent b993700259
commit 351901d5ca
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java
+9 -9
View File
@@ -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;
/**实收时间*/
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+14 -14
View File
@@ -330,6 +330,12 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
PaySpendingContractImportExcel paySpendingContractImportExcel = new PaySpendingContractImportExcel();
// 获取合同信息
PaySpendingContract paySpendingContract = setPaySpendingContractExcel(sub,mapOpening,mapPack,n + 1,sb);
if(!Objects.isNull(paySpendingContract)){
StringBuilder msg = ValidUtil.validateExcel(paySpendingContract,n + 1);
if(!StringUtils.isBlank(msg)){
sb.append(msg.toString());
}
}
paySpendingContractImportExcel.setSpendingContract(paySpendingContract);
int count1 = count - listSpendingContract.size();
if(count > 0){
@@ -342,9 +348,9 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
List<PaySpendingContractInstallment> 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<PaySpendingContr
paySpendingContractInstallment.setPaidTime(DateUtils.str2Date(sub.get(mm + 4), new SimpleDateFormat("yyyy-MM-dd")));
}
}
StringBuilder msg = ValidUtil.validateSpendingContractExcel(paySpendingContractInstallment,n + 1,i + 1);
if(!StringUtils.isBlank(msg)){
sb.append(msg.toString());
}
listPaySpendingContractInstallment.add(paySpendingContractInstallment);
}
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
@@ -399,7 +409,6 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
List<PaySpendingContract> listDBContractNum = paySpendingContractService.list(queryDBContractNum);
// 获取excel负责人
List<SysUser> listDBPrincipalName = sysUserService.list();
// 校验excel中是否存在重复合同编号
List<PaySpendingContract> listPaySpendingContract = new ArrayList<>();
listPaySpendingContractImportExcel.forEach(p->{
@@ -413,12 +422,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
sb.append("第").append(n + 1).append("行:合同编号在excel中重复，请修改！<br/>");
}
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<PaySpendingContr
List<PaySpendingContractInstallment> 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){