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 a7821f8..6c4d270 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 @@ -839,13 +839,13 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); +/* LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectid); queryWrapper.eq(HuzhouPlaninfo::getTaskName,"项目立项阶段"); queryWrapper.eq(HuzhouPlaninfo::getIsfinish,"2"); if ( this.list(queryWrapper).size()<1){ throw new EasyException("项目立项阶段未完成,无法修改项目计划!"); - } + }*/ //解析项目计划文件 HashMap hashMap = getPlanInfoListFromFile(multipartFile, projectid); @@ -854,10 +854,10 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl excelList =(ArrayList) hashMap.get("arr"); List huzhouPlaninfoArrayList = (ArrayList) hashMap.get("arr"); // 深克隆备份Excel重点计划以供后续做差集操作 List excelList = SerializationUtils.clone((ArrayList) hashMap.get("arr")); + // 未完成的项目则可以修改 String isAllow = IsAllowModifyPlaninfo(projectid, huzhouPlaninfoArrayList); if (!"1".equals(isAllow)) { throw new EasyException(isAllow); @@ -878,6 +878,11 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl "项目立项阶段".equals(item.getTaskName())); + + for (HuzhouPlaninfo huzhouPlaninfo : huzhouPlaninfoArrayList) { + log.info("待插入的计划信息为{}",huzhouPlaninfo.getTaskLevel()); + } saveBatch(huzhouPlaninfoArrayList); //创建流程 @@ -933,7 +938,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl= 0; + return taskLevel.compareTo(BigDecimal.valueOf(1.6)) > 0; } catch (NumberFormatException e) { // 如果转换失败,可以选择处理异常或忽略这条记录 throw new EasyException("无法将 taskLevel 转换为数字: " + item.getTaskLevel()); @@ -957,9 +962,9 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl