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

update code

dev_xds
haha 2024-05-08 00:09:51 +08:00
parent 0703ac1fa3
commit 71bca5dfed
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
View File

@ -220,11 +220,7 @@ public class ProblemmodifyController extends BaseController {
where.setPrjIds(getProjectIds()); where.setPrjIds(getProjectIds());
} }
} }
String key="problemmodify_getMonitAndWarning-"+deptId+"_"+projectId+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds());
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return AjaxResult.success(obj);
}
where.setDeptId(deptId); where.setDeptId(deptId);
where.setProjectId(projectId); where.setProjectId(projectId);
@ -239,8 +235,9 @@ public class ProblemmodifyController extends BaseController {
//map.put("week",smzSspProblemmodifyService.countByDateRange(where)); //map.put("week",smzSspProblemmodifyService.countByDateRange(where));
map.put("week",smzSspProblemmodifyService.countByDateRangeNew(where)); map.put("week",smzSspProblemmodifyService.countByDateRangeNew(where));
//各类型整改、未整改数量统计 //各类型整改、未整改数量统计
where.setEndDate(new Date());
where.setStartDate(DateUtils.addDays(new Date(),-30));
map.put("group",smzSspProblemmodifyService.groupByInfotypeCheckStateNew(where)); map.put("group",smzSspProblemmodifyService.groupByInfotypeCheckStateNew(where));
redisCache.setCacheObject(key, map, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(map); return AjaxResult.success(map);
} }

4
yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
View File

@ -37,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectFlowLabourInfoVo"/> <include refid="selectFlowLabourInfoVo"/>
<where> <where>
fl.is_del=0 fl.is_del=0
<if test="projectId != null "> and fl.project_id = #{projectId}</if> <if test="projectId != null and projectId!=0 "> and fl.project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and fl.project_name like concat('%', #{projectName}, '%')</if> <if test="projectName != null and projectName != ''"> and fl.project_name like concat('%', #{projectName}, '%')</if>
<if test="deptId != null "> and fl.dept_id = #{deptId}</if> <if test="deptId != null and deptId!=0"> and fl.dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and fl.dept_name like concat('%', #{deptName}, '%')</if> <if test="deptName != null and deptName != ''"> and fl.dept_name like concat('%', #{deptName}, '%')</if>
<if test="subDeptId != null "> and fl.sub_dept_id = #{subDeptId}</if> <if test="subDeptId != null "> and fl.sub_dept_id = #{subDeptId}</if>
<if test="subDeptName != null and subDeptName != ''"> and fl.sub_dept_name like concat('%', #{subDeptName}, '%')</if> <if test="subDeptName != null and subDeptName != ''"> and fl.sub_dept_name like concat('%', #{subDeptName}, '%')</if>

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

@ -696,6 +696,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM smz_ssp_problemmodify p FROM smz_ssp_problemmodify p
left join sur_project sp on p.projectId=sp.id left join sur_project sp on p.projectId=sp.id
WHERE p.isDel=0 and sp.isDel=0 WHERE p.isDel=0 and sp.isDel=0
<![CDATA[
and DATE(p.createTime)>=Date(#{startDate}) and Date(p.createTime)<=Date(#{endDate})
]]>
<if test="projectId &gt; 0"> and p.projectId=#{projectId}</if> <if test="projectId &gt; 0"> and p.projectId=#{projectId}</if>
<if test="deptId >0 ">AND sp.deptid = #{deptId}</if> <if test="deptId >0 ">AND sp.deptid = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -710,6 +713,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select '96' as infotype,'4' as checkState,count(1) as total from dev_ai_project_data ad select '96' as infotype,'4' as checkState,count(1) as total from dev_ai_project_data ad
left join sur_project sp on ad.project_id=sp.id left join sur_project sp on ad.project_id=sp.id
where sp.isDel=0 where sp.isDel=0
<![CDATA[
and DATE(ad.create_time)>=Date(#{startDate}) and Date(ad.create_time)<=Date(#{endDate})
]]>
<if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if> <if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if>
<if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if> <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -724,6 +730,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select '97' as infotype,fli1.approve_status as checkState,count(1) as total from flow_labour_info fli1 select '97' as infotype,fli1.approve_status as checkState,count(1) as total from flow_labour_info fli1
left join sur_project sp on fli1.project_id=sp.id left join sur_project sp on fli1.project_id=sp.id
where fli1.is_del=0 where fli1.is_del=0
<![CDATA[
and DATE(fli1.create_time)>=Date(#{startDate}) and Date(fli1.create_time)<=Date(#{endDate})
]]>
<if test="projectId &gt; 0"> and fli1.project_id=#{projectId}</if> <if test="projectId &gt; 0"> and fli1.project_id=#{projectId}</if>
<if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if> <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>