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

修改bug#41017

Browse Source
This commit is contained in:
梁琦涛
2021-10-19 18:11:10 +08:00
parent 3603ae872b
commit 63ac63bad3
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+13 -13
View File
@@ -533,33 +533,33 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
paySpendingContract.setNoTaxAmount(new BigDecimal(map.get(9))); paySpendingContract.setNoTaxAmount(new BigDecimal(map.get(9)));
} }
} }
if(!StringUtils.isBlank(map.get(11)) ){ if(!StringUtils.isBlank(map.get(10)) ){
if(!DateUtils.isValidDate(map.get(11))){ if(!DateUtils.isValidDate(map.get(10))){
sb.append("第").append(n).append("行，合同签订日期格式不正确 <br/>"); sb.append("第").append(n).append("行，合同签订日期格式不正确 <br/>");
}else{ }else{
paySpendingContract.setContractDate(DateUtils.str2Date(map.get(11),new SimpleDateFormat("yyyy-MM-dd"))); paySpendingContract.setContractDate(DateUtils.str2Date(map.get(10),new SimpleDateFormat("yyyy-MM-dd")));
} }
} }
if(!StringUtils.isBlank(map.get(12))){ if(!StringUtils.isBlank(map.get(11))){
if(!DateUtils.isValidDate(map.get(12))) { if(!DateUtils.isValidDate(map.get(11))) {
sb.append("第").append(n).append("行，合同终止日期格式不正确 <br/>"); sb.append("第").append(n).append("行，合同终止日期格式不正确 <br/>");
}else{ }else{
paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(12),new SimpleDateFormat("yyyy-MM-dd"))); paySpendingContract.setTerminationDate(DateUtils.str2Date(map.get(11),new SimpleDateFormat("yyyy-MM-dd")));
} }
} }
paySpendingContract.setContractTimePoints(map.get(13)); paySpendingContract.setContractTimePoints(map.get(12));
if(!StringUtils.isBlank(map.get(13))){ if(!StringUtils.isBlank(map.get(12))){
if(!pattern.matcher(map.get(13)).matches()){ if(!pattern.matcher(map.get(12)).matches()){
sb.append("第").append(n).append("行，应收金额格式错误！"); sb.append("第").append(n).append("行，应收金额格式错误！");
}else{ }else{
paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(13))); paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(12)));
} }
} }
if(!StringUtils.isBlank(map.get(14))){ if(!StringUtils.isBlank(map.get(13))){
if(!pattern.matcher(map.get(14)).matches()){ if(!pattern.matcher(map.get(13)).matches()){
sb.append("第").append(n).append("行，已收金额格式错误！"); sb.append("第").append(n).append("行，已收金额格式错误！");
}else{ }else{
paySpendingContract.setAmountReceived(new BigDecimal(map.get(14))); paySpendingContract.setAmountReceived(new BigDecimal(map.get(13)));
} }
} }