From 3817e4c1198721b63ed1382019c97b1a68ccce42 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Mon, 30 Jun 2025 11:16:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=A6=81=E8=80=83=E8=99=91?=
 =?UTF-8?q?=E7=9B=91=E7=90=86=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/HuzhouSubProjectinfoMapper.java       |  8 ++++++++
 .../impl/HuzhouPlaninfoServiceImpl.java       |  1 -
 .../impl/HuzhouProjectinfoServiceImpl.java    |  1 +
 .../impl/HuzhouSubProjectinfoServiceImpl.java | 20 +++++++++++++++----
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouSubProjectinfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouSubProjectinfoMapper.java
index 459270a..2723a15 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouSubProjectinfoMapper.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouSubProjectinfoMapper.java
@@ -4,6 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
 import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo;
+import org.apache.ibatis.annotations.Select;
 
 public interface HuzhouSubProjectinfoMapper extends BaseMapper<HuzhouSubProjectinfo> {
+    /**
+     * 获取子项目名称
+     * @param subProjectId 子项目id
+     * @return 子项目名称
+     */
+    @Select("select project_name from huzhou_sub_projectinfo where id = #{subProjectId}")
+    String getSubProjectName (String subProjectId);
 }
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 ddc2580..51446da 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
@@ -725,7 +725,6 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
                 }
             }
         }
-        // 删除掉已完成或者审批中的信息
         newPlanInfos.removeAll(toRemove);
         newPlanInfos.forEach(item -> log.info("待新上传的计划阶段名称:{}-->任务所处状态{}:",item.getTaskName(), item.getIsfinish()));
 
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index aaaac37..3458d7d 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -2918,6 +2918,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
                 String projectId = projectInfo.getId();
                 // 1.获取当且任务所处的节点名称
                 String currentPointName = planinfoMapper.getCurrentPointName(projectId);
+
                 if (StringUtils.isNotBlank(currentPointName)) {
                     projectInfo.setCurrentPointName(currentPointName);
                     // 当且阶段有实际提交过文件
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java
index ae03b65..614e1f4 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java
@@ -84,15 +84,27 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl<HuzhouSubProjec
                         item.setProjectId(subProjectId);
                         item.setId(null);
                         // 子项目默认1阶段全部完成
-                        if (item.getTaskLevel() != null && PATTERN_PREFIX_1.matcher(item.getTaskLevel()).find()){
+                        if (item.getTaskLevel() != null && PATTERN_PREFIX_1.matcher(item.getTaskLevel()).find()) {
                             item.setIsfinish(CommonConstant.PRO_PLAN_FINISHED);
-                            log.info("阶段：{},完成情况：{}",item.getTaskLevel(),item.getIsfinish());
-                        }else {
+                            log.info("阶段：{},完成情况：{}", item.getTaskLevel(), item.getIsfinish());
+                        } else {
                             item.setIsfinish(CommonConstant.PRO_PLAN_UNFINISHED);
                         }
                     })
                     .collect(Collectors.toList());
-            log.info("saveBatch数量 {} ,updatedHuzhouPlaninfoList:{} " ,updatedHuzhouPlaninfoList.size(),updatedHuzhouPlaninfoList);
+            log.info("saveBatch数量 {} " ,updatedHuzhouPlaninfoList.size());
+            //如果要考虑监理项目
+            // 1.根据subProjectId获取对应的子项目名称是否包含了 监理项目
+            // 2.如果包含了监理项目 则只需要保留监理项目所需要的节点就行,不需要全部复制
+            // 3. List<String> finalList = Arrays.asList("a", "b","c");
+            // Set<String> allowedNames = new HashSet<>(finalList);
+            //  当 projectName 包含 "监理项目" 时，才对 taskName 做过滤
+            //    .filter(item -> {
+            //        if (item.getProjectName() != null && item.getProjectName().contains("监理项目")) {
+            //            return allowedNames.contains(item.getTaskName());
+            //        }
+            //        return true; // 否则保留所有
+            //    })
             planinfoService.saveBatch(updatedHuzhouPlaninfoList);
 
         }else {