wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

聚集告警记录bug修复

pull/5/head
dearlin 2024-02-28 10:19:17 +08:00
parent d97dbcb715
commit 1d855bb46f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/positioning/PositAlarmController.java
View File

@ -528,7 +528,7 @@ public class PositAlarmController extends BaseController {
public ReturnMap getAlarmGatherPsnInfo() throws Exception { public ReturnMap getAlarmGatherPsnInfo() throws Exception {
PageData pageData = this.getPageData(); PageData pageData = this.getPageData();
ReturnMap returnMap = new ReturnMap(); ReturnMap returnMap = new ReturnMap();
JSONObject body = PLSUtil.GeneralGetById("/old/gatherAlarms/getAlarmGatherPsnInfo", pageData.getString("id"),Jurisdiction.getCORPINFO_ID()); JSONObject body = PLSUtil.GeneralGetById("/old/gatherAlarms/getAlarmGatherPsnInfo?id=", pageData.getString("id"),Jurisdiction.getCORPINFO_ID());
if (body != null) { if (body != null) {
returnMap.putAll(body); returnMap.putAll(body);
} }

16
src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml
View File

@ -15,20 +15,20 @@
</select> </select>
<select id="listAllForDiagnosis" parameterType="pd" resultType="pd"> <select id="listAllForDiagnosis" parameterType="pd" resultType="pd">
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_BLINDBOARD f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_BLINDBOARD f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
union all union all
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_BREAKGROUND f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_BREAKGROUND f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
union all union all
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_CONFINEDSPACE f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_CONFINEDSPACE f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
union all union all
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_ELECTRICITY f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_ELECTRICITY f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
union all union all
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_CUTROAD f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_CUTROAD f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
union all union all
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HIGHWORK f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HIGHWORK f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
union all union all
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HOISTING f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HOISTING f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
union all union all
select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HOTWORK f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HOTWORK f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
</select> </select>
</mapper> </mapper>