diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java index 6f58e621..95c4c2c7 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java @@ -179,7 +179,8 @@ public class ProjectCheckingController extends BaseController { where.setPrjIds(getProjectIds()); } } - String key="bgscreen_projectChecking_groupCheckingByProjectId_"+pageNum+"-"+pageSize+"_"+where.getDeptId()+"_"+where.getProjectDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); + String key="bgscreen_projectChecking_groupCheckingByProjectId_"+pageNum+"-"+pageSize+"_"+where.getDeptId() + +"_"+where.getProjectDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds()); List objs=redisCache.getCacheObject(key); if(objs!=null){ return getDataTable(objs); @@ -189,7 +190,7 @@ public class ProjectCheckingController extends BaseController { } startPage(); List list = surProjectCheckingService.selectBgscreenProjectCheckingListByPage(where); - redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + //redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return getDataTable(list); } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml index 6e82395b..bde10796 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml @@ -162,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + and spc.data_type_lvl1 = #{dataTypeLvl1} and spc.data_type_lvl2 = #{dataTypeLvl2} and sp.projectName like concat('%', #{projectName}, '%') and spc.dept_id = #{deptId}