Commit 1c58721b authored by 高建强's avatar 高建强

item:直流中心-消防系统运行状态总览修改

parent 00a3888e
...@@ -10,6 +10,6 @@ public class FireFightingSystemDto { ...@@ -10,6 +10,6 @@ public class FireFightingSystemDto {
private String name; private String name;
private Integer equipTotal = 0; private Integer equipTotal = 0;
private Integer alarmEquipTotal = 0; private Integer alarmEquipTotal = 0;
private String status; private Integer status = 0;
private String image; private String image;
} }
...@@ -2000,10 +2000,10 @@ ...@@ -2000,10 +2000,10 @@
IFNULL(s.alarmEquipTotal, 0) AS alarmEquipTotal, IFNULL(s.alarmEquipTotal, 0) AS alarmEquipTotal,
<choose> <choose>
<when test="date != null"> <when test="date != null">
IFNULL(s.total, IF(s.total > 0,1,0)) AS `status` IF(s.total > 0,1,0) AS `status`
</when> </when>
<otherwise> <otherwise>
IFNULL(s.alarmEquipTotal, IF(s.alarmEquipTotal > 0,1,0)) AS `status` IF(s.alarmEquipTotal > 0,1,0) AS `status`
</otherwise> </otherwise>
</choose> </choose>
FROM FROM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment