Skip to content

A
amos-boot-biz
Commit 50557328 authored by KeYong's avatar KeYong
Browse files
Options

Merge remote-tracking branch 'origin/develop_dl_3.7.1.1' into develop_dl_3.7.1.1

parents 9ace0120 ba4c5a94
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 29 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ 50557328
......@@ -1668,15 +1668,15 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} else {
HashMap<String, Object> alarmMap = new HashMap<>();
alarmMap.put("equipment_name", "无");
alarmMap.put("num", "无");
alarmMap.put("normalEquipNum", "无");
alarmMap.put("normalEquipPercent", "无");
alarmMap.put("fault_equip_num", "无");
alarmMap.put("alarm_info_num", "无");
alarmMap.put("faultEquipPercent", "无");
alarmMap.put("alarm_equip_num", "无");
alarmMap.put("alarmEquipPercent", "无");
alarmMap.put("total_info_num", "无");
alarmMap.put("num", "");
alarmMap.put("normalEquipNum", "");
alarmMap.put("normalEquipPercent", "");
alarmMap.put("fault_equip_num", "");
alarmMap.put("alarm_info_num", "");
alarmMap.put("faultEquipPercent", "");
alarmMap.put("alarm_equip_num", "");
alarmMap.put("alarmEquipPercent", "");
alarmMap.put("total_info_num", "");
maps.add(alarmMap);
}
systemData.put("list", maps);
......@@ -1900,14 +1900,14 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} else {
HashMap<String, Object> listItem = new HashMap<>();
listItem.put("name", "无");
listItem.put("num", "无");
listItem.put("normalNum", "无");
listItem.put("type_name", "无");
listItem.put("monitoringData", "无");
listItem.put("acquisition", "无");
listItem.put("normal", "无");
listItem.put("alarmEquipNum", "无");
listItem.put("trueNum", "无");
listItem.put("num", "");
listItem.put("normalNum", "");
listItem.put("type_name", "");
listItem.put("monitoringData", "");
listItem.put("acquisition", "");
listItem.put("normal", "");
listItem.put("alarmEquipNum", "");
listItem.put("trueNum", "");
list.add(listItem);
}
......@@ -2137,14 +2137,14 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} else {
HashMap<String, Object> listItem = new HashMap<>();
listItem.put("name", "无");
listItem.put("num", "无");
listItem.put("normalNum", "无");
listItem.put("type_name", "无");
listItem.put("monitoringData", "无");
listItem.put("acquisition", "无");
listItem.put("normal", "无");
listItem.put("alarmEquipNum", "无");
listItem.put("trueNum", "无");
listItem.put("num", "");
listItem.put("normalNum", "");
listItem.put("type_name", "");
listItem.put("monitoringData", "");
listItem.put("acquisition", "");
listItem.put("normal", "");
listItem.put("alarmEquipNum", "");
listItem.put("trueNum", "");
list.add(listItem);
}
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 50557328
......@@ -4242,16 +4242,13 @@
ifnull(SUM(index_true_num), 0)
FROM
wl_equipment_alarm_report_day report
LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids )
LEFT JOIN wl_equipment_specific spec on report.equipment_specific_id = spec.id
where report.system_ids is not null and report.index_true_num > 0
<foreach collection="indicator" item="index" open="AND(" separator="or" close=")">
report.index_type like concat ('%', #{index})
</foreach>
and report.report_date BETWEEN #{startDate} and #{endDate}
and FIND_IN_SET( #{systemId}, system_id)
and FIND_IN_SET( #{systemId}, report.system_ids)
and index_type = #{indexType}
and report.equipment_code = #{equipmentCode}
</select>
......
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