补充日志

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,

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.将原有计划信息保存到历史记录中