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

update code

dev_xds
haha 2024-04-29 23:48:03 +08:00
parent 98009c0428
commit b6c4b380ab
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
View File

@ -155,7 +155,7 @@ public class ProjectAttendanceController extends BaseController {
where.setPrjIds(getProjectIds()); where.setPrjIds(getProjectIds());
} }
} }
String key="bgscreen_attendance_groupAllByComany-"+where.getDeptId()+"-"+where.getSubDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); String key="bgscreen_attendance_groupAllByComany-"+where.getId()+"-"+where.getDeptId()+"-"+where.getSubDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds());
Object obj=redisCache.getCacheObject(key); Object obj=redisCache.getCacheObject(key);
if(obj!=null){ if(obj!=null){
return AjaxResult.success(obj); return AjaxResult.success(obj);

3
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
View File

@ -356,7 +356,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select g.companyTypeId,count(1) id select g.companyTypeId,count(1) id
from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g, from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g,
sur_project sp sur_project sp
where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId and u.state=0 and c.project_id = sp.id where u.cfgid=c.id and u.companyId=g.companyId and u.state=#{id} and c.project_id = sp.id
and sp.isDel=0 and sp.progressVisible=0 and sp.isDel=0 and sp.progressVisible=0
and g.companyTypeId in (0,1,2,3,4,5,6,8) and g.companyTypeId in (0,1,2,3,4,5,6,8)
<if test="projectId!=null and projectId>0"> <if test="projectId!=null and projectId>0">
@ -368,6 +368,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if> <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0"> <if test="prjIds !=null and prjIds.size()>0">
and c.project_id in and c.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=","> <foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>