修改排序规则

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -5630,6 +5630,7 @@
                 AND fs.system_type_code = #{systemCode}
             </if>
         GROUP BY det.`code`
+        ORDER BY status
     </select>
 
     <select id="getFireSystemEquipStatusList" resultType="java.util.Map">
@@ -5641,6 +5642,7 @@
             wle.shbz_img shbzImg,
             ei.is_alarm AS type,
             IFNULL( spe.realtime_iot_index_value, '--' ) AS realtimeValue,
+            CASE when ei.is_alarm = 1 and spe.realtime_iot_index_value = 'true' then 1 else 0  END as orderNo,
             IFNULL( ws.full_name, '--' ) AS fullName,
             IFNULL( spe.realtime_iot_index_update_date, '--' ) AS updateDate
         FROM
@@ -5665,7 +5667,7 @@
                 </foreach>
             </if>
         GROUP BY spe.id
-        ORDER BY spe.id
+        ORDER BY orderNo desc
     </select>
 
     <select id="selectPressureDetails" resultType="java.util.Map">