From be19c476b55a94e1d71ba7de5e55027571f3c81a Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Mon, 8 Apr 2024 02:08:28 +0800
Subject: [PATCH] update code

---
 .../web/controller/ProjectBuildNodeController.java   | 12 ++++++------
 .../project/SurProjectAttendanceUserMapper.xml       |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

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 26b00c43..b1957aba 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
@@ -45,7 +45,7 @@ public class ProjectBuildNodeController extends BaseController {
         }
 
         List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.selectScheduledAlerts(where);
-
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success();
     }
 
@@ -69,7 +69,7 @@ public class ProjectBuildNodeController extends BaseController {
         }
 
         List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.countCompletionRate(where);
-
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
     }
 
@@ -86,7 +86,7 @@ public class ProjectBuildNodeController extends BaseController {
             return AjaxResult.success(obj);
         }
         List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.selectCurrent(where);
-
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success();
     }
 
@@ -110,7 +110,7 @@ public class ProjectBuildNodeController extends BaseController {
         }
         surProjectBuildNodeDataService.addProjectNodes(projectId);
         list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(surProjectBuildNodeData);
-
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
     }
 
@@ -127,7 +127,7 @@ public class ProjectBuildNodeController extends BaseController {
             return AjaxResult.success(obj);
         }
         List list=surProjectBuildNodeDataService.queryByProjectType(type);
-
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
     }
 
@@ -140,7 +140,7 @@ public class ProjectBuildNodeController extends BaseController {
             return AjaxResult.success(obj);
         }
         List list=surProjectBuildNodeDataService.queryFinishProject(projectId);
-
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
     }
 
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
index 7d380f62..d7f56e2d 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
@@ -518,9 +518,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         u.teamId,u.teamName,u.enterType,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
         b.project_id,b.sub_dept_id,u.companyName,u.workTypeName,u.groupName,
         b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName
-        FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g
-        left join sur_project sp on b.project_id = sp.id
-        WHERE u.cfgid=b.id and u.state=0 and u.companyId=g.companyId and sp.isDel=0 and sp.progressVisible=0
+        FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project sp
+        WHERE u.cfgid=b.id and u.state=0 and u.companyId=g.companyId and sp.isDel=0 and sp.progressVisible=0 and b.project_id = sp.id
         <if test="id==101">
             and g.companyTypeId in (1,6)
         </if>