From a77cd2572fae653df15a202bdcd692a8e9c44a04 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 21:43:19 +0800
Subject: [PATCH] 11

---
 ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml b/ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml
index f7ac3e9..f84b45c 100644
--- a/ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml
@@ -12,36 +12,42 @@
 
     <select id="list" resultType="com.ycl.dto.allot.EfficiencyDto">
         SELECT
-            t4.NAME NAME,
-            COUNT(1) NUMBER,
-            sum(case WHEN ubc.state = 3 then 1 ELSE 0 END) errorNumber
+            t3.NAME NAME,
+            COUNT( 1 ) NUMBER,
+            sum( CASE WHEN ubc.state = 3 THEN 1 ELSE 0 END ) errorNumber
         FROM
             `ums_base_case` AS ubc
                 JOIN ums_violations AS uv ON ubc.id = uv.id
-                LEFT JOIN ums_data_dictionary AS t3 ON uv.category_id = t3.id
-                LEFT JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
+                LEFT JOIN ums_data_dictionary AS t3 ON uv.grade_id = t3.id
                 LEFT JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
         WHERE
             ubc.category = 1
-          AND t4.`name` IS NOT NULL
+          AND t3.`name` IS NOT NULL
         GROUP BY
-            t4.id
+            t3.id
     </select>
     <select id="aiMonthList" resultMap="AIIotStatisticsVO">
         SELECT
-            t4.NAME type,
+            t3.NAME type,
             DATE_FORMAT(alarm_time,'%Y-%m') month,
             COUNT(1) count
         FROM
             `ums_base_case` AS ubc
             JOIN ums_violations AS uv ON ubc.id = uv.id
-            LEFT JOIN ums_data_dictionary AS t3 ON uv.category_id = t3.id
-            LEFT JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
+            LEFT JOIN ums_data_dictionary AS t3 ON uv.grade_id = t3.id
             LEFT JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
         WHERE
             ubc.category = 1
-          AND t4.`name` IS NOT NULL
+          AND t3.`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')
+            t3.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
+    </select>
+
 </mapper>

--
Gitblit v1.8.0