From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/resources/mapper/HistoryMonthlyMapper.xml | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryMonthlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryMonthlyMapper.xml
index 942a9a0..4efcb36 100644
--- a/screen-api/src/main/resources/mapper/HistoryMonthlyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryMonthlyMapper.xml
@@ -9,4 +9,19 @@
<result column="value" property="value"/>
</resultMap>
+ <select id="listAll" resultType="com.moral.api.pojo.vo.historyMonthly.HistoryResultVo">
+ select DATE_FORMAT(time,'%Y-%m') time,${type}
+ from history_monthly
+ where date(time) <![CDATA[>=]]> #{startTime}
+ and date(time) <![CDATA[<=]]> #{endTime}
+ and mac in
+ <foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ group by time
+ order by time
+ </select>
+
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0