Commit 4bb6e495 authored by 高建强's avatar 高建强

item:物联日报表,添加系统排序,解决bug

parent f0ba2de8
......@@ -1902,7 +1902,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
// echarts 图表
List<Map<String, Object>> mapList = fireFightingSystemMapper.selectDayEquipEchart(valueOf(system.get("code")), startDate, endDate);
String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比");
systemData.put("pictureLeft", pieChart1);
// List<Map<String, Object>> dayEcharts = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("id")), startDate, indicatorList);
ArrayList<Map<String, Object>> dayEchart = new ArrayList<>();
......@@ -1921,7 +1920,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
dayEchart.add(dayEchartsDate1);
String pieChart2 = ChartsUtils.pieChart(dayEchart, "告警信息占比");
systemData.put("pictureRight", pieChart2);
systemData.put("pictureRight", pieChart1);
systemData.put("pictureLeft", pieChart2);
systemData.put("sysData", list);
......
......@@ -3647,6 +3647,7 @@
LEFT JOIN wl_equipment_category wec
on ffs.system_type = wec.id
WHERE biz_org_code = #{bizOrgCode}
order by ffs.sort
</select>
<select id="selectAlarmList" resultType="java.util.Map">
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