From da1f438d895163faf219cf2990a3c38cacaac86a Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sun, 20 Aug 2023 12:49:48 +0800
Subject: [PATCH] update code

---
 .../ProjectBuildNodeController.java           |  9 +++++
 .../mapper/SurProjectBuildNodeDataMapper.java |  2 ++
 .../ISurProjectBuildNodeDataService.java      |  2 ++
 .../SurProjectBuildNodeDataServiceImpl.java   |  5 +++
 .../project/SurProjectBuildNodeDataMapper.xml | 33 ++++++++++++++++++-
 5 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
index 6c4e972d..4967f6ee 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
@@ -26,6 +26,15 @@ public class ProjectBuildNodeController {
         return AjaxResult.success(surProjectBuildNodeDataService.selectScheduledAlerts(where));
     }
 
+    /**
+     * 节点完成率统计-进度管理
+     * @param where
+     * @return
+     */
+    @PostMapping("/countCompletionRate")
+    public AjaxResult countCompletionRate(@RequestBody SurProjectBuildNodeData where){
+        return AjaxResult.success(surProjectBuildNodeDataService.countCompletionRate(where));
+    }
     /**
      * 获取当前节点及叶子节点
      * @param where
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java
index 96b61489..6f63db80 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java
@@ -72,4 +72,6 @@ public interface SurProjectBuildNodeDataMapper
      * @return
      */
     public List<SurProjectBuildNodeData> selectCurrent(SurProjectBuildNodeData where);
+
+    public List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java
index 93e759f3..03f7bb4b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java
@@ -77,4 +77,6 @@ public interface ISurProjectBuildNodeDataService
      * @return
      */
     public  List<SurProjectBuildNodeData> selectCurrent(SurProjectBuildNodeData where);
+
+    public  List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java
index 1855bfe6..3348da59 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java
@@ -175,4 +175,9 @@ public class SurProjectBuildNodeDataServiceImpl implements ISurProjectBuildNodeD
     public List<SurProjectBuildNodeData> selectCurrent(SurProjectBuildNodeData where) {
         return surProjectBuildNodeDataMapper.selectCurrent(where);
     }
+
+    @Override
+    public List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where) {
+        return surProjectBuildNodeDataMapper.countCompletionRate(where);
+    }
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
index b4f9f8d0..c2670248 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
@@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectScheduledAlerts"  parameterType="SurProjectBuildNodeData" resultMap="SurProjectBuildNodeDataResultNode">
         SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN (
-            SELECT MIN(id) FROM vw_sur_project_build_node_data_current
+            SELECT MAX(id) FROM vw_sur_project_build_node_data_current
             WHERE LENGTH(node_lvl)=2
             <if test="projectId !=null and projectId !=0">and project_id=#{projectId}</if>
             <if test="id!=null and id!=0">and project_id in (SELECT id FROM sur_project WHERE deptid=#{id})</if>
@@ -161,4 +161,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectId !=null and projectId !=0">and project_id=#{projectId}</if>
         GROUP BY project_id)) b WHERE a.project_id=b.project_id AND LEFT(a.node_lvl,2)=b.node_lvl
     </select>
+    <select id="countCompletionRate" parameterType="SurProjectBuildNodeData" resultMap="SurProjectBuildNodeDataResultNode">
+        SELECT IF(b.cnt,b.cnt,0) id ,IF(c.cnt,c.cnt,0) node_id,a.project_id,a.projectName,a.node_text,a.node_lvl FROM (
+              SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN (
+                  SELECT MAX(id) FROM vw_sur_project_build_node_data_current
+                  WHERE LENGTH(node_lvl)=2
+                    <if test="projectId !=null and projectId !=0">and project_id=#{projectId}</if>
+                    <if test="id!=null and id!=0">and project_id in (SELECT id FROM sur_project WHERE deptid=#{id})</if>
+                  GROUP BY project_id)) a LEFT JOIN (
+
+
+
+            SELECT a.project_id,COUNT(1) cnt FROM vw_sur_project_build_node_data_current a,
+                  (SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN (
+                      SELECT MAX(id) FROM vw_sur_project_build_node_data_current
+                      WHERE LENGTH(node_lvl)=2
+                        <if test="projectId !=null and projectId !=0">and project_id=#{projectId}</if>
+                        <if test="id!=null and id!=0">and project_id in (SELECT id FROM sur_project WHERE deptid=#{id})</if>
+                      GROUP BY project_id)) b WHERE a.project_id=b.project_id AND LEFT(a.node_lvl,2)=b.node_lvl AND LENGTH(a.node_lvl)>2
+            GROUP BY a.project_id) b ON a.project_id =b.project_id
+
+            LEFT JOIN(
+            SELECT a.project_id,COUNT(1) cnt FROM vw_sur_project_build_node_data_current a,
+              (SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN (
+                  SELECT MAX(id) FROM vw_sur_project_build_node_data_current
+                  WHERE LENGTH(node_lvl)=2
+                    <if test="projectId !=null and projectId !=0">and project_id=#{projectId}</if>
+                    <if test="id!=null and id!=0">and project_id in (SELECT id FROM sur_project WHERE deptid=#{id})</if>
+                  GROUP BY project_id)) b WHERE a.project_id=b.project_id AND LEFT(a.node_lvl,2)=b.node_lvl AND LENGTH(a.node_lvl)>2 AND a.end_date IS NOT NULL
+            GROUP BY a.project_id
+        ) c ON a.project_id=c.project_id
+    </select>
 </mapper>
\ No newline at end of file