From 2f13947a84f4d88d9603a23a687d5e7d576367b7 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 24 Aug 2023 00:12:35 +0800
Subject: [PATCH] update code

---
 .../jh/bigscreen/web/controller/ProjectController.java      | 6 +++---
 .../java/com/yanzhu/jh/project/mapper/SurProjectMapper.java | 2 +-
 .../com/yanzhu/jh/project/service/ISurProjectService.java   | 2 +-
 .../jh/project/service/impl/SurProjectServiceImpl.java      | 4 ++--
 .../src/main/resources/mapper/project/SurProjectMapper.xml  | 6 ++++--
 .../src/main/resources/mapper/work/WorkTrainMapper.xml      | 2 +-
 6 files changed, 12 insertions(+), 10 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 992a7bef..c1947977 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
@@ -73,13 +73,13 @@ public class ProjectController {
     }
 
     @GetMapping("groupByProjectCategory")
-    public AjaxResult groupByProjectCategory(){
-        String key="bgscreen_prj_groupByProjectCategory";
+    public AjaxResult groupByProjectCategory(long deptId){
+        String key="bgscreen_prj_groupByProjectCategory_"+deptId;
         Object obj=redisCache.getCacheObject(key);
         if(obj!=null){
             return AjaxResult.success(obj);
         }
-        List<SurProject> list= isurProjectService.groupByProjectCategory();
+        List<SurProject> list= isurProjectService.groupByProjectCategory(deptId);
         redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
     }
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 7a3ab7a6..217a9191 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
@@ -76,6 +76,6 @@ public interface SurProjectMapper
 
     public List<SurProject> selectProgressProjects(long deptId);
 
-    public List<SurProject> groupByProjectCategory();
+    public List<SurProject> groupByProjectCategory(long deptId);
 }
 
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 4bef261f..8e9ae500 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
@@ -61,7 +61,7 @@ public interface ISurProjectService
 
     public List<SurProject> selectProgressProjects(long deptId);
 
-    public List<SurProject> groupByProjectCategory();
+    public List<SurProject> groupByProjectCategory(long deptId);
 
     public List<SurProject>  groupByCategory(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 193cc528..10db716b 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
@@ -102,8 +102,8 @@ public class SurProjectServiceImpl implements ISurProjectService
     }
 
     @Override
-    public List<SurProject> groupByProjectCategory() {
-        return surProjectMapper.groupByProjectCategory();
+    public List<SurProject> groupByProjectCategory(long deptId) {
+        return surProjectMapper.groupByProjectCategory(deptId);
     }
 
     @Override
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
index c541aa47..3e230b46 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
@@ -312,11 +312,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by projectSort,projectName
     </select>
 
-    <select id="groupByProjectCategory" parameterType="SurProject" resultMap="SurProjectResult">
+    <select id="groupByProjectCategory" parameterType="Long" 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
+            (SELECT projectType,IF(projectSchedule IS NULL,1,projectSchedule) projectSchedule  FROM sur_project WHERE isDel=0
+                <if test="deptId!=null and deptId>0">and  deptid=#{deptId}</if>
+            ) p
             ON p.projectType=d.dict_value
         GROUP BY d.dict_value,d.dict_label,p.projectSchedule
     </select>
diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
index 5d037eb3..4ae88de5 100644
--- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         group by wt.id
         order by wt.create_time desc
-        limit 2
+        limit 20
     </select>
     
     <select id="selectWorkTrainById" parameterType="Long" resultMap="WorkTrainWorkTrainDeptResult">