bug修改

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

@@ -2259,7 +2259,7 @@
 
     <select id="getFireCarInfo" resultType="java.util.Map">
         SELECT
-        a.total,
+        COUNT( 1 ) AS total,
         IFNULL( sum( a.carStartState ), 0 ) AS carStartNum,
         IFNULL( sum( a.carCloseState ), 0 ) AS carCloseNum
         FROM
@@ -2267,7 +2267,6 @@
         SELECT
         `wc`.`id` AS `id`,
         `wc`.`name` AS `name`,
-        count(wc.id) as total,
         max(
         CASE
 
@@ -2290,11 +2289,12 @@
         `wl_car` `wc`
         LEFT JOIN `wl_car_property` `wcp` ON `wcp`.`car_id` = `wc`.`id`
         <where>
-            1=1
             <if test="bizOrgCode!=null and bizOrgCode!=''">
-                AND wc.biz_org_code like concat(#{bizOrgCode}, '%')
+                wc.biz_org_code like concat(#{bizOrgCode}, '%')
             </if>
         </where>
+        GROUP BY
+        wc.id
         ) a
     </select>
 
@@ -2352,8 +2352,19 @@
         ou.`code`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
-        IFNULL((
-        TRUNCATE (abs(
+        (
+        CASE
+
+        WHEN max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ) IS NULL THEN
+        '--'
+        WHEN max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ) >= IFNULL( rp.min_water_level, 0 )
+        AND rp.max_water_level IS NULL THEN
+        '100'
+        WHEN max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ) &lt; IFNULL( rp.min_water_level, 0 )
+        AND rp.max_water_level IS NULL THEN
+        '--' ELSE IFNULL((
+        TRUNCATE (
+        abs(
         IFNULL(
         max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ),
         IFNULL( rp.min_water_level, 0 )) /
@@ -2361,16 +2372,21 @@
         (
         IFNULL( rp.max_water_level, 0 ) = 0,
         1,
-        IFNULL( rp.max_water_level, 0 ))) * 100, 2)
+        IFNULL( rp.max_water_level, 0 ))) * 100,
+        2
+        )
         ),
         0
+        )
+        END
         ) AS levelAbs,
-        IFNULL(
-        max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ),
-        IFNULL( rp.min_water_level, 0 )) AS nowLevel,
+        IFNULL( max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ), '--' ) AS nowLevel,
         (
         CASE
 
+        WHEN max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ) IS NULL
+        OR rp.min_water_level IS NULL THEN
+        '--'
         WHEN IFNULL(
         max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ),
         IFNULL( rp.min_water_level, 0 )) &lt; IFNULL( rp.min_water_level, 0 ) THEN
@@ -2390,7 +2406,7 @@
         LEFT JOIN wl_equipment_index ei ON ei.equipment_id = ed.equipment_id
         LEFT JOIN wl_equipment e ON e.id = ei.equipment_id
         LEFT JOIN wl_equipment_category ec ON ec.id = e.category_id
-        LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET(fs.id,es.system_id)
+        LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, es.system_id )
         WHERE
         r.resource_type IN ( 'pool', 'industryPool' )
         AND r.is_delete = 1
@@ -2403,6 +2419,8 @@
         </if>
         GROUP BY
         r.sequence_nbr
+        ORDER BY
+        levelStatus DESC
     </select>
 
     <select id="getFireSystemInfo"  resultType="java.util.Map">