sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-04-08 02:08:28 +08:00
parent 73690ae5c2
commit be19c476b5
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
View File

@ -45,7 +45,7 @@ public class ProjectBuildNodeController extends BaseController {
} }
List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.selectScheduledAlerts(where); List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.selectScheduledAlerts(where);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -69,7 +69,7 @@ public class ProjectBuildNodeController extends BaseController {
} }
List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.countCompletionRate(where); List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.countCompletionRate(where);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list); return AjaxResult.success(list);
} }
@ -86,7 +86,7 @@ public class ProjectBuildNodeController extends BaseController {
return AjaxResult.success(obj); return AjaxResult.success(obj);
} }
List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.selectCurrent(where); List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.selectCurrent(where);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -110,7 +110,7 @@ public class ProjectBuildNodeController extends BaseController {
} }
surProjectBuildNodeDataService.addProjectNodes(projectId); surProjectBuildNodeDataService.addProjectNodes(projectId);
list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(surProjectBuildNodeData); list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(surProjectBuildNodeData);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list); return AjaxResult.success(list);
} }
@ -127,7 +127,7 @@ public class ProjectBuildNodeController extends BaseController {
return AjaxResult.success(obj); return AjaxResult.success(obj);
} }
List list=surProjectBuildNodeDataService.queryByProjectType(type); List list=surProjectBuildNodeDataService.queryByProjectType(type);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list); return AjaxResult.success(list);
} }
@ -140,7 +140,7 @@ public class ProjectBuildNodeController extends BaseController {
return AjaxResult.success(obj); return AjaxResult.success(obj);
} }
List list=surProjectBuildNodeDataService.queryFinishProject(projectId); List list=surProjectBuildNodeDataService.queryFinishProject(projectId);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list); return AjaxResult.success(list);
} }

5
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
View File

@ -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, 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,u.companyName,u.workTypeName,u.groupName,
b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName 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 FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project sp
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 and 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
<if test="id==101"> <if test="id==101">
and g.companyTypeId in (1,6) and g.companyTypeId in (1,6)
</if> </if>