3小bug修改

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

@@ -2292,14 +2292,16 @@
     </select>
 
     <select id="getFireCarInfoByWL" resultType="java.util.Map">
-        select a.* from
-        (SELECT
+        SELECT
+        a.*
+        FROM
+        (
+        SELECT
         `wc`.`id` AS `id`,
         `wc`.`name` AS `name`,
-        max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_WaterCapacity' ) THEN `wcp`.`value` END ) AS
-        `waterCapacity`,
-        max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_FoamCapacity' ) THEN `wcp`.`value` END ) AS
-        `foamCapacity`,
+        IFNULL( max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_WaterCapacity' ) THEN `wcp`.`value` END ), 0 ) AS `waterCapacity`,
+        IFNULL( max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_FoamCapacity' ) THEN `wcp`.`value` END ), 0 ) AS `foamCapacity`,
+        IFNULL(
         max(
         CASE
 
@@ -2308,7 +2310,10 @@
         WHEN ( `wcp`.`equipment_index_key` = 'FireCar_Start' AND `wcp`.`value` = 'false' ) THEN
         '熄火'
         END
+        ),
+        '未知'
         ) AS `carState`,
+        IFNULL(
         max(
         CASE
 
@@ -2317,6 +2322,8 @@
         WHEN ( `wcp`.`equipment_index_key` = 'FireCar_Start' AND `wcp`.`value` = 'false' ) THEN
         `wcp`.`update_date`
         END
+        ),
+        ''
         ) AS `carStateDate`
         FROM
         `wl_car` `wc`
@@ -2327,7 +2334,8 @@
                 AND wc.biz_org_code like concat(#{bizOrgCode}, '%')
             </if>
         </where>
-        group by `wc`.`id`
+        GROUP BY
+        `wc`.`id`
         ) a
     </select>
 
@@ -2338,7 +2346,7 @@
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
         IFNULL((
-        abs(
+        TRUNCATE (abs(
         IFNULL(
         max( CASE WHEN ei.name_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.perf_value END ),
         IFNULL( rp.min_water_level, 0 )) /
@@ -2346,7 +2354,7 @@
         (
         IFNULL( rp.max_water_level, 0 ) = 0,
         1,
-        IFNULL( rp.max_water_level, 0 ))) * 100
+        IFNULL( rp.max_water_level, 0 ))) * 100, 2)
         ),
         0
         ) AS levelAbs,