From 5e497e503cfaecee344813e9c94eef840a6913f8 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Tue, 12 Aug 2025 11:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=88=E5=90=8C=E7=AD=BE=E8=AE=A2?=
 =?UTF-8?q?=E5=88=99=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=99=85=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HuzhouPlaninfofileServiceImpl.java   | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

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<HuzhouPlaninfofil
                 String userid = map.get("value");
                 userIdlist.add(userid);
             }
-            List<HuzhouContractinfo> 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<HuzhouContractinfo> 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);
+            }
+
         }
     }