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 { * @return */ List queryChildPlan(String projectid,String superior,String status); - String IsAllowModifyPlaninfo(String projectid,List newPlaninfo); + void filterIsAllowModifyPlaninfo(String projectid, List newPlaninfo); HuzhouPlaninfo getNodePlan(String projectid,String level); Page 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 newPlanInfos) { + public void filterIsAllowModifyPlaninfo(String projectid, List newPlanInfos) { //如果审批中或已完成的内容,不在修改的内容中newPlaninfo,就会报错 // 删除已完成的内容或者审批中的内容 List planInfoDbList = this.getFinishOrApprovalListByProjectId(projectid); @@ -703,15 +703,15 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl任务所处状态{}",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 excelList = SerializationUtils.clone((ArrayList) hashMap.get("arr")); // 未完成的项目则可以修改 - String isAllow = IsAllowModifyPlaninfo(projectid, huzhouPlaninfoArrayList); + filterIsAllowModifyPlaninfo(projectid, huzhouPlaninfoArrayList); //修改项目计划会重新修改项目阶段类型 projectinfoService.modifyStageById(projectid,"4"); @@ -995,7 +995,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl