From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml b/ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml
index 3bf526b..05092bf 100644
--- a/ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml
@@ -41,8 +41,12 @@
WHERE
ubc.category = 1
AND t4.`name` IS NOT NULL
+ <if test="beginTime!=null">
+ and ubc.alarm_time BETWEEN #{beginTime} and #{endTime}
+ </if>
GROUP BY
t4.id,DATE_FORMAT(alarm_time,'%Y-%m')
+ ORDER BY DATE_FORMAT(alarm_time,'%Y-%m') desc ,COUNT(1) desc
</select>
<select id="getSmokeCustomer" resultType="java.lang.Long">
select count(1) total from ums_ods_customer
--
Gitblit v1.8.0