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

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
姜玉琦 2024-04-09 00:57:40 +08:00
parent 265a7abb1a 61cac97d84
commit f8833cd1fd
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
View File

@ -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<Object> objs=redisCache.getCacheObject(key);
if(objs!=null){
return getDataTable(objs);
@ -189,7 +190,7 @@ public class ProjectCheckingController extends BaseController {
}
startPage();
List<SurProjectChecking> 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);
}
}

1
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
View File

@ -162,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
<if test="dataTypeLvl1 != null "> and spc.data_type_lvl1 = #{dataTypeLvl1}</if>
<if test="dataTypeLvl2 != null "> and spc.data_type_lvl2 = #{dataTypeLvl2}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="deptId != null "> and spc.dept_id = #{deptId}</if>

10
yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
View File

@ -430,7 +430,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.dict_label as problemArea,
COUNT(1) as roleType
FROM
smz_ssp_problemmodify sp
vw_smz_ssp_problemmodify_audit sp
left join sur_project p on p.id=sp.projectId
left join sys_dict_data sd on sd.dict_value=sp.danger_type
<if test="infoType==0">and sd.dict_type = 'ssp_aqyhlx'</if>
@ -462,7 +462,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from
(
select projectId,prjName,count(1) proble from vw_smz_ssp_problemmodify_audit
where infoType=#{infoType} AND isDel=0
where infoType=#{infoType} AND isDel=0 AND progressVisible=0
<if test="projectId>0">and projectId=#{projectId}</if>
<if test='proType != null and proType != "" and proType != "0"'> and proType = #{proType}</if>
<if test="deptId >0 ">AND deptid = #{deptId}</if>
@ -481,7 +481,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join(
select projectid,count(1) timoutNoComp from vw_smz_ssp_problemmodify_audit where
((updateTime is null and date(nickedTime) &lt; date(now()) ) or date(updateTime )>date(nickedTime))
and infoType=#{infoType} AND isDel=0
and infoType=#{infoType} AND isDel=0 AND progressVisible=0
<if test="projectId>0">and projectId=#{projectId}</if>
<if test="deptId >0 ">AND deptid = #{deptId}</if>
<if test="prjIds !=null and prjIds.size()>0">
@ -499,7 +499,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join (
SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE (updateTime is null and date(nickedTime) &lt; date(now()) )
and infoType=#{infoType} AND isDel=0
and infoType=#{infoType} AND isDel=0 AND progressVisible=0
<if test="projectId>0">and projectId=#{projectId}</if>
<if test="deptId >0 ">AND deptid = #{deptId}</if>
<if test="prjIds !=null and prjIds.size()>0">
@ -518,7 +518,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join(
select projectid,count(1) comp from vw_smz_ssp_problemmodify_audit where
checkState=4
and infoType=#{infoType} AND isDel=0
and infoType=#{infoType} AND isDel=0 AND progressVisible=0
<if test="projectId>0">and projectId=#{projectId}</if>
<if test="deptId >0 ">AND deptid = #{deptId}</if>
<if test="prjIds !=null and prjIds.size()>0">