From 657e73b4cb9cd8ee1679acd8001589bc0e93f164 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Tue, 4 Mar 2025 11:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9(=E5=BE=85=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=92=8C=E6=AC=A1=E6=95=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HuzhouPlaninfoServiceImpl.java       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

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<HuzhouPlaninfoMapper,
     @Override
     public void modifyPlaninfo(MultipartFile multipartFile, String projectid) throws Exception {
         //增加文件修改条件:项目立项阶段全部完成之后才可以修改项目计划
-        LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
+/*        LambdaQueryWrapper<HuzhouPlaninfo> 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<String, Object> hashMap = getPlanInfoListFromFile(multipartFile, projectid);
@@ -854,10 +854,10 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
         if (!res) {
             throw new EasyException((String) hashMap.get("msg"));
         }
-       // List<HuzhouPlaninfo> excelList =(ArrayList<HuzhouPlaninfo>) hashMap.get("arr");
         List<HuzhouPlaninfo> huzhouPlaninfoArrayList = (ArrayList<HuzhouPlaninfo>) hashMap.get("arr");
         // 深克隆备份Excel重点计划以供后续做差集操作
         List<HuzhouPlaninfo> excelList = SerializationUtils.clone((ArrayList<HuzhouPlaninfo>) 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<HuzhouPlaninfoMapper,
         wrapper.set(HuzhouPlaninfo::getGroupId,huzhouPlaninfoArrayList.get(0).getGroupId());
         update(null,wrapper);
         //批量新增
+        huzhouPlaninfoArrayList.removeIf(item -> "项目立项阶段".equals(item.getTaskName()));
+
+        for (HuzhouPlaninfo huzhouPlaninfo : huzhouPlaninfoArrayList) {
+            log.info("待插入的计划信息为{}",huzhouPlaninfo.getTaskLevel());
+        }
         saveBatch(huzhouPlaninfoArrayList);
 
         //创建流程
@@ -933,7 +938,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
                     try {
                         // 过滤条件：只保留 taskLevel 大于 2 的记录
                         BigDecimal taskLevel = new BigDecimal(item.getTaskLevel());
-                        return taskLevel.compareTo(BigDecimal.valueOf(1.7)) >= 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<HuzhouPlaninfoMapper,
         });
 
         huzhouPlaninfoArrayList.addAll(tmpDifList);
-//        for (HuzhouPlaninfo huzhouPlaninfo : huzhouPlaninfoArrayList) {
-//            log.info("修改后的计划信息为{}",huzhouPlaninfo.getTaskLevel());
-//        }
+        for (HuzhouPlaninfo huzhouPlaninfo : huzhouPlaninfoArrayList) {
+            log.info("修改后的计划信息为{}",huzhouPlaninfo.getTaskLevel());
+        }
     }
 
     @Override