diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index be0f206..d5eadde 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -765,17 +765,21 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl collectForSave = contractList.stream().map(contract -> { - contract.setStatus("1"); - String itemProjectId = contract.getProjectId(); - String itemTaskName = contract.getTaskName(); - // 存在合同信息(计划) 则插入的为实际合同信息 - contract.setFlag(contractinfoService.hasContractinfoByTaskName(itemProjectId, itemTaskName) ? "实际" : "计划"); - return contract; - }).collect(Collectors.toList()); - - contractinfoService.saveBatch(collectForSave); - log.info("新增原有合同信息:{}", collectForSave); + // 是合同签订则新增实际合同信息 + if (!taskName.equals("合同签订")){ + List collectForSave = contractList.stream().map(contract -> { + contract.setStatus("1"); + String itemProjectId = contract.getProjectId(); + String itemTaskName = contract.getTaskName(); + // 存在合同信息(计划) 则插入的为实际合同信息 + contract.setFlag(contractinfoService.hasContractinfoByTaskName(itemProjectId, itemTaskName) ? "实际" : "计划"); + return contract; + }).collect(Collectors.toList()); + + contractinfoService.saveBatch(collectForSave); + log.info("新增原有合同信息:{}", collectForSave); + } + } }