diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java index a41bcf1..bb63650 100644 --- a/src/main/java/common/service/impl/ContractServiceImpl.java +++ b/src/main/java/common/service/impl/ContractServiceImpl.java @@ -2572,6 +2572,7 @@ public class ContractServiceImpl implements ContractService { if ("contract_code".equals(sheetTitle)) { if (!codeUniqueDic.containsKey(dataSTR)) { codeUniqueDic.put(dataSTR, "1"); + filter.put("contractCode",dataSTR); } else { return ResultModel.ERROR(ResultStatus.CCODE_EXITS.getCode(),"合同编号【" + dataSTR + "】已存在,请重新上传"); } @@ -2690,6 +2691,7 @@ public class ContractServiceImpl implements ContractService { } } } + List<Contract> masterContracts = new ArrayList<>(); if("tkio".equals(platform)&&"2".equals(filter.get("contractType"))){ if(filter.get("relation_code")==null){ @@ -2710,6 +2712,20 @@ public class ContractServiceImpl implements ContractService { return ResultModel.ERROR("第" + filter.get("rowIndex") + "行【补充协议签订日期】不能晚于关联合同的结束日期"); } + DateTime dateTime = new DateTime(signedDate);//补充协议晚录判断 + String relationCode = relation_code; + while(true){ + Contract contract = contractRepository.findByCodePlatform(relationCode, platform); + if(StringUtils.isEmpty(contract.getNextSignedDate())){ + contract.setNextSignedDate(dateTime.plusDays(-1).toString("yyyy-MM-dd"));//签订日的前一天 + contract.setNextSignedContractCode(filter.get("contractCode")); + contractRepository.save(contract); + break; + }else{ + relationCode = contract.getNextSignedContractCode(); + } + } + } } }