From efa20f31a5fb1d5e84fa5efa9001b9d84fcd15cc Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Thu, 27 Mar 2025 15:05:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/service/IHuzhouPlaninfoService.java       |  2 +-
 .../service/impl/HuzhouPlaninfoServiceImpl.java      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java
index 6280c7f..56473d9 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java
@@ -54,7 +54,7 @@ public interface IHuzhouPlaninfoService extends IService<HuzhouPlaninfo> {
      * @return
      */
     List<HuzhouPlaninfo> queryChildPlan(String projectid,String superior,String status);
-    String IsAllowModifyPlaninfo(String projectid,List<HuzhouPlaninfo> newPlaninfo);
+    void filterIsAllowModifyPlaninfo(String projectid, List<HuzhouPlaninfo> newPlaninfo);
 
     HuzhouPlaninfo getNodePlan(String projectid,String level);
     Page<Map> getplanSummary(HuzhouProjectinfo projectinfo,
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
index 8e9685e..cd6e11e 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
@@ -689,7 +689,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
     }
 
     @Override
-    public String IsAllowModifyPlaninfo(String projectid, List<HuzhouPlaninfo> newPlanInfos) {
+    public void filterIsAllowModifyPlaninfo(String projectid, List<HuzhouPlaninfo> newPlanInfos) {
         //如果审批中或已完成的内容，不在修改的内容中newPlaninfo，就会报错
         // 删除已完成的内容或者审批中的内容
         List<HuzhouPlaninfo> planInfoDbList = this.getFinishOrApprovalListByProjectId(projectid);
@@ -703,15 +703,15 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
                     String newTaskLevel = newPlanInfo.getTaskLevel();
                     if (nowTaskLevel.equals(newTaskLevel) && nowTaskName.equals(newTaskName)) {
                         toRemove.add(newPlanInfo);
-                        log.info("需要删除的任务阶段名称:{}",newTaskName);
+                        log.info("需要删除的任务阶段名称:{} -->任务所处状态{}",newTaskName,now.getIsfinish());
                     }
                 }
             }
         }
         // 删除掉已完成或者审批中的信息
         newPlanInfos.removeAll(toRemove);
-        newPlanInfos.forEach(item -> log.info("待上传的计划信息-->newPlanInfo:" + item.getTaskName()));
-        return "1";
+        newPlanInfos.forEach(item -> log.info("待新上传的计划阶段名称{}-->任务所处状态{}:",item.getTaskName(), item.getIsfinish()));
+
     }
 
     @Override
@@ -934,7 +934,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
             // 深克隆备份Excel重点计划以供后续做差集操作
             List<HuzhouPlaninfo> excelList = SerializationUtils.clone((ArrayList<HuzhouPlaninfo>) hashMap.get("arr"));
             // 未完成的项目则可以修改
-            String isAllow = IsAllowModifyPlaninfo(projectid, huzhouPlaninfoArrayList);
+            filterIsAllowModifyPlaninfo(projectid, huzhouPlaninfoArrayList);
 
             //修改项目计划会重新修改项目阶段类型
             projectinfoService.modifyStageById(projectid,"4");
@@ -995,7 +995,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
 
         // 5.新增要求:未完成的项目则可以修改
         // 这里按照之前逻辑将 处于审批和未完成的计划过滤掉
-        String isAllow = IsAllowModifyPlaninfo(projectid, planInfoList);
+        filterIsAllowModifyPlaninfo(projectid, planInfoList);
         //修改项目计划会重新修改项目阶段类型
         projectinfoService.modifyStageById(projectid,"4");
         // 6.将原有计划信息保存到历史记录中