From d268f82d25c25ebdc7a1ea30614f6cda6d3a9ae3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 10 十月 2024 16:31:41 +0800
Subject: [PATCH] win库+大屏考核指标查询bug

---
 ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml |   68 ++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
index e8c64e5..4e5d238 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
@@ -139,19 +139,44 @@
     </select>
 
     <select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexCar">
-        SELECT
-            IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,
-            IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
-            IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,
-            IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 0), 0) AS vehicle_information_collection_accuracy,
-            IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 0), 0) AS vehicle_capture_integrity,
-            IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 0), 0) AS vehicle_capture_accuracy,
-            IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 0), 0) AS vehicle_timing_accuracy,
-            IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 0), 0) AS vehicle_upload_timeliness,
-            IFNULL(ROUND(AVG(vehicle_url_availability * 100), 0), 0) AS vehicle_url_availability,
-            IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 0), 0) AS vehicle_picture_availability
-        FROM
-            t_check_index_car
+<!--        SELECT-->
+<!--            IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,-->
+<!--            IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,-->
+<!--            IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,-->
+<!--            IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 0), 0) AS vehicle_information_collection_accuracy,-->
+<!--            IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 0), 0) AS vehicle_capture_integrity,-->
+<!--            IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 0), 0) AS vehicle_capture_accuracy,-->
+<!--            IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 0), 0) AS vehicle_timing_accuracy,-->
+<!--            IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 0), 0) AS vehicle_upload_timeliness,-->
+<!--            IFNULL(ROUND(AVG(vehicle_url_availability * 100), 0), 0) AS vehicle_url_availability,-->
+<!--            IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 0), 0) AS vehicle_picture_availability-->
+<!--        FROM-->
+<!--            t_check_index_car-->
+<!--        <where>-->
+<!--            <if test="deptId != null">-->
+<!--                AND dept_id = #{deptId}-->
+<!--            </if>-->
+<!--            <if test="dataScope == 1">-->
+<!--                AND examine_tag = 0-->
+<!--            </if>-->
+<!--            <if test="dataScope == 2">-->
+<!--                AND examine_tag = 1-->
+<!--            </if>-->
+<!--            <if test="dataScope == 3">-->
+<!--                AND examine_tag = 2-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        ORDER BY-->
+<!--            create_time DESC-->
+<!--        <if test="deptId == null">-->
+<!--            LIMIT 7-->
+<!--        </if>-->
+<!--        <if test="deptId != null">-->
+<!--            LIMIT 1-->
+<!--        </if>-->
+        WITH LatestRecords AS (
+        SELECT *
+        FROM t_check_index_car
         <where>
             <if test="deptId != null">
                 AND dept_id = #{deptId}
@@ -166,13 +191,26 @@
                 AND examine_tag = 2
             </if>
         </where>
-        ORDER BY
-            create_time DESC
+        ORDER BY create_time DESC
         <if test="deptId == null">
             LIMIT 7
         </if>
         <if test="deptId != null">
             LIMIT 1
         </if>
+        )
+        SELECT
+        IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,
+        IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
+        IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,
+        IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 0), 0) AS vehicle_information_collection_accuracy,
+        IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 0), 0) AS vehicle_capture_integrity,
+        IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 0), 0) AS vehicle_capture_accuracy,
+        IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 0), 0) AS vehicle_timing_accuracy,
+        IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 0), 0) AS vehicle_upload_timeliness,
+        IFNULL(ROUND(AVG(vehicle_url_availability * 100), 0), 0) AS vehicle_url_availability,
+        IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 0), 0) AS vehicle_picture_availability
+        FROM
+        LatestRecords;
     </select>
 </mapper>

--
Gitblit v1.8.0