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 51230f37..ac12af93 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 @@ -533,33 +533,33 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); }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(!DateUtils.isValidDate(map.get(12))) { + if(!StringUtils.isBlank(map.get(11))){ + if(!DateUtils.isValidDate(map.get(11))) { sb.append("第").append(n).append("行,合同终止日期格式不正确
"); }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)); - if(!StringUtils.isBlank(map.get(13))){ - if(!pattern.matcher(map.get(13)).matches()){ + paySpendingContract.setContractTimePoints(map.get(12)); + if(!StringUtils.isBlank(map.get(12))){ + if(!pattern.matcher(map.get(12)).matches()){ sb.append("第").append(n).append("行,应收金额格式错误!"); }else{ - paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(13))); + paySpendingContract.setAccountsReceivableAmount(new BigDecimal(map.get(12))); } } - if(!StringUtils.isBlank(map.get(14))){ - if(!pattern.matcher(map.get(14)).matches()){ + if(!StringUtils.isBlank(map.get(13))){ + if(!pattern.matcher(map.get(13)).matches()){ sb.append("第").append(n).append("行,已收金额格式错误!"); }else{ - paySpendingContract.setAmountReceived(new BigDecimal(map.get(14))); + paySpendingContract.setAmountReceived(new BigDecimal(map.get(13))); } }