是合同签订则新增实际合同信息

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java

@@ -765,17 +765,21 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
                 String userid = map.get("value");
                 userIdlist.add(userid);
             }
-            List<HuzhouContractinfo> collectForSave = contractList.stream().map(contract -> {
+            // 是合同签订则新增实际合同信息
-                contract.setStatus("1");
+            if (!taskName.equals("合同签订")){
-                String itemProjectId = contract.getProjectId();
+                List<HuzhouContractinfo> collectForSave = contractList.stream().map(contract -> {
-                String itemTaskName = contract.getTaskName();
+                    contract.setStatus("1");
-                // 存在合同信息(计划) 则插入的为实际合同信息
+                    String itemProjectId = contract.getProjectId();
-                contract.setFlag(contractinfoService.hasContractinfoByTaskName(itemProjectId, itemTaskName) ? "实际" : "计划");
+                    String itemTaskName = contract.getTaskName();
-                return contract;
+                    // 存在合同信息(计划) 则插入的为实际合同信息
-            }).collect(Collectors.toList());
+                    contract.setFlag(contractinfoService.hasContractinfoByTaskName(itemProjectId, itemTaskName) ? "实际" : "计划");
-
+                    return contract;
-            contractinfoService.saveBatch(collectForSave);
+                }).collect(Collectors.toList());
-            log.info("新增原有合同信息:{}", collectForSave);
+
+                contractinfoService.saveBatch(collectForSave);
+                log.info("新增原有合同信息:{}", collectForSave);
+            }
+
         }
     }