From 69fe5c709ecf9093b1640356eff7c1991a6dd7d3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 23 Apr 2020 11:53:54 +0800
Subject: [PATCH] add定制导报表接口
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 7af50a1..26ef457 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -183,7 +183,7 @@
select
rs.monitorPointName,rs.name,
<foreach collection="timeList" separator="," item="time">
- max(case time when #{time} then rs.${sensorKey} else null end) as #{time}
+ max(case time when #{time} then rs.${sensorKey} else "" end) as #{time}
</foreach>
from
(SELECT
@@ -210,7 +210,7 @@
ORDER BY
h.mac) rs
GROUP BY rs.monitorPointName,rs.name
- order by rs.name
+ order by rs.monitorPointName
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0