From c1030cfbddd79f74edb05dca407a0b730b1d999f Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sat, 12 Aug 2023 14:16:24 +0800
Subject: [PATCH] update code

---
 .../web/controller/ProjectController.java     | 19 ++++++++--
 .../jh/project/mapper/SurProjectMapper.java   |  2 ++
 .../project/service/ISurProjectService.java   |  6 ++++
 .../service/impl/SurProjectServiceImpl.java   | 15 ++++++++
 .../mapper/project/SurProjectMapper.xml       | 36 +++++++++----------
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
index c3fd9a65..5e0c8aee 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
@@ -5,10 +5,9 @@ import com.yanzhu.jh.project.domain.SurProject;
 import com.yanzhu.jh.project.service.ISurProjectService;
 import com.yanzhu.jh.project.domain.SurProjectBuildNodeData;
 import com.yanzhu.jh.project.service.ISurProjectBuildNodeDataService;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -53,4 +52,18 @@ public class ProjectController {
         return AjaxResult.success(isurProjectService.selectProgressProjects());
     }
 
+    @GetMapping("groupByProjectCategory")
+    public AjaxResult groupByProjectCategory(){
+        return AjaxResult.success(isurProjectService.groupByProjectCategory());
+    }
+
+    @PostMapping("groupByCategory")
+    public AjaxResult groupByCategory(@RequestBody SurProject surProject){
+        return AjaxResult.success(isurProjectService.groupByCategory(surProject));
+    }
+
+    @PostMapping("groupByLevel")
+    public AjaxResult groupByLevel(@RequestBody SurProject surProject){
+        return AjaxResult.success(isurProjectService.groupByLevel(surProject));
+    }
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java
index 39ed4343..c6cc5c3c 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMapper.java
@@ -75,5 +75,7 @@ public interface SurProjectMapper
     public List<SurProject> groupByLevel(SurProject surProject);
 
     public List<SurProject> selectProgressProjects();
+
+    public List<SurProject> groupByProjectCategory();
 }
 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java
index 23bf0a4b..5470c053 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectService.java
@@ -60,4 +60,10 @@ public interface ISurProjectService
     public int deleteSurProjectById(Long id);
 
     public List<SurProject> selectProgressProjects();
+
+    public List<SurProject> groupByProjectCategory();
+
+    public List<SurProject>  groupByCategory(SurProject surProject);
+
+    public List<SurProject>  groupByLevel(SurProject surProject);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java
index 73bedf9a..8bee8f6b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java
@@ -99,4 +99,19 @@ public class SurProjectServiceImpl implements ISurProjectService
     public List<SurProject> selectProgressProjects() {
         return surProjectMapper.selectProgressProjects();
     }
+
+    @Override
+    public List<SurProject> groupByProjectCategory() {
+        return surProjectMapper.groupByProjectCategory();
+    }
+
+    @Override
+    public List<SurProject> groupByCategory(SurProject surProject) {
+        return surProjectMapper.groupByCategory(surProject);
+    }
+
+    @Override
+    public List<SurProject> groupByLevel(SurProject surProject) {
+        return surProjectMapper.groupByLevel(surProject);
+    }
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
index f0cc3f74..120c5898 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
@@ -280,16 +280,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="groupByCategory" parameterType="SurProject" resultMap="SurProjectResult">
         SELECT b.dict_value id,b.dict_label projectName,cnt  deptId FROM (
         SELECT b.dict_value,  b.dict_label,
-            <choose>
-                <when test="deptName = 'total'">
-                    SUM(totalInvestment*10000)
-                </when>
-                <otherwise>
-                    COUNT(1)
-                </otherwise>
-            </choose>
+        <if test="id==0">COUNT(1)*10000</if>
+        <if test="id==1">SUM(totalInvestment*10000.0)</if>
+        <if test="id==2">COUNT(1)*10000</if>
         cnt FROM sur_project a, sys_dict_data b WHERE b.dict_type='project_category'
-        AND a.projectType=b.dict_value
+        AND a.projectType=b.dict_value and a.isDel=0
         <if test="deptId>0">AND deptid=#{deptId}</if>
         GROUP BY dict_value,dict_label
         ) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_category'  ORDER BY cnt DESC
@@ -297,16 +292,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="groupByLevel" parameterType="SurProject" resultMap="SurProjectResult">
         SELECT b.dict_value id,b.dict_label projectName,cnt  deptId FROM (
         SELECT b.dict_value,  b.dict_label,
-        <choose>
-            <when test="deptName = 'total'">
-                SUM(totalInvestment*10000)
-            </when>
-            <otherwise>
-                COUNT(1)
-            </otherwise>
-        </choose>
+               <if test="id==0">COUNT(1)*10000</if>
+                <if test="id==1">SUM(totalInvestment*10000.0)</if>
+                <if test="id==2">COUNT(1)*10000</if>
+
         cnt FROM sur_project a, sys_dict_data b WHERE b.dict_type='project_level'
-        AND a.projiectLevel=b.dict_value
+        AND a.projiectLevel=b.dict_value and a.isDel=0
         <if test="deptId>0">AND deptid=#{deptId}</if>
         GROUP BY dict_value,dict_label
         ) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_level'  ORDER BY cnt DESC
@@ -317,4 +308,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where progressVisible = 0
         order by projectSort,projectName
     </select>
+
+    <select id="groupByProjectCategory" parameterType="SurProject" resultMap="SurProjectResult">
+        SELECT d.dict_value dept_name,d.dict_label projectName,p.projectSchedule ,COUNT(1) deptId FROM
+                (SELECT * FROM sys_dict_data WHERE dict_type='project_category')  d
+                    LEFT JOIN
+            (SELECT projectType,IF(projectSchedule IS NULL,1,projectSchedule) projectSchedule  FROM sur_project WHERE isDel=0 ) p
+            ON p.projectType=d.dict_value
+        GROUP BY d.dict_value,d.dict_label,p.projectSchedule
+    </select>
 </mapper>
\ No newline at end of file