bug修改

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRecordMapper.xml

@@ -19,7 +19,11 @@
                 'pv' AS stationType,
                 GATEWAY_ID,
                 concat(POINT_NAME, '异常') AS pointName,
-                DISPOSOTION_DATE as disposotionDate
+                DISPOSOTION_DATE as disposotionDate,
+                (case when WARNING_NAME = '注意' then 1
+                     when WARNING_NAME = '警告' then 2
+                     when WARNING_NAME = '危险' then 3
+                end) as sort
             FROM
                 idx_biz_pv_warning_record UNION ALL
             SELECT
@@ -33,7 +37,11 @@
                 'fan' AS stationType,
                 GATEWAY_ID,
                 concat(POINT_NAME, '异常') AS pointName,
-                DISPOSOTION_DATE as disposotionDate
+                DISPOSOTION_DATE as disposotionDate,
+                (case when WARNING_NAME = '注意' then 1
+                when WARNING_NAME = '警告' then 2
+                when WARNING_NAME = '危险' then 3
+                end) as sort
             FROM
                 idx_biz_fan_warning_record
         ) a
@@ -61,7 +69,7 @@
             AND concat(#{endDate}, ' 23:59:59') >= a.recDate
         </if>
     </where>
-    order by warningName DESC, recDate DESC
+    order by sort DESC, recDate DESC
     limit #{current}, #{size}
 </select>