百分比bug修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -470,8 +470,8 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
             b.*,
             ( b.firefightersNum - b.fireCer ) AS unfireCer,
             ( b.opertNum - b.operCer ) AS unoperCer,
-            TRUNCATE ( abs(( b.fireCer ) / IF (( b.firefightersNum ) = 0, 1, b.firefightersNum )), 2 ) * 100 AS fireAbs,
-            TRUNCATE ( abs(( b.operCer ) / IF (( b.opertNum ) = 0, 1, b.opertNum )), 2 ) * 100 AS operAbs
+            TRUNCATE ( abs(( b.fireCer ) / IF (( b.firefightersNum ) = 0, 1, b.firefightersNum )) * 100, 2 ) AS fireAbs,
+            TRUNCATE ( abs(( b.operCer ) / IF (( b.opertNum ) = 0, 1, b.opertNum )) * 100, 2 ) AS operAbs
         FROM
             (
                 SELECT
@@ -508,9 +508,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         SELECT b.qualifiedNum, b.unQualifiedNum, (TRUNCATE ( abs(( b.qualifiedNum ) / IF (( b.totalNum = 0 ),
         1,
         b.totalNum
-        )),
-        2
-        ) * 100) as qualifiedAbs
+        )) * 100 ,2)) as qualifiedAbs
         FROM
         (
         SELECT

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

@@ -2668,9 +2668,7 @@
                             abs(((
                                      count( a.id ) - count( a.alarmNum > 0 OR NULL )) /
                                  IF
-                                     (( count( a.id ) = 0 ), 1, count( a.id ) ))),
-                            2
-                        ) * 100
+                                     (( count( a.id ) = 0 ), 1, count( a.id ) ))) * 100, 2)
                 ) AS normalAbs
         FROM
             (
@@ -2701,9 +2699,7 @@
         abs(((
         count( a.nowLevel >= a.minLevel OR NULL )) /
         IF
-        (( count( 1 ) = 0 ), 1, count( 1 ) ))),
-        2
-        ) * 100
+        (( count( 1 ) = 0 ), 1, count( 1 ) ))) * 100, 2)
         ) AS normalAbs
         FROM
         (
@@ -2805,9 +2801,7 @@
         abs((
         b.near7DaysStartNum) /
         IF
-        (( b.totalCarNum = 0 ), 1, b.totalCarNum )),
-        2
-        ) * 100) as carAbs
+        (( b.totalCarNum = 0 ), 1, b.totalCarNum )) * 100 , 2)) as carAbs
         from
         (SELECT
         count(( a.carStateDate BETWEEN DATE_ADD( now(), INTERVAL - 7 DAY ) AND now()) OR NULL ) AS near7DaysStartNum,
@@ -2840,10 +2834,10 @@
                 temp.alarmEquipTotalNum - temp.notReturned
                 ) AS returned,
             (
-                    TRUNCATE ( abs(( temp.alarmEquipTotalNum ) / IF (( temp.total = 0 ), 1, temp.total )), 2 ) * 100
+                    TRUNCATE ( abs(( temp.alarmEquipTotalNum ) / IF (( temp.total = 0 ), 1, temp.total )) * 100, 2 )
                 ) AS equipAbs,
             (
-                    TRUNCATE ( abs(( temp.alarmEquipTotalNum - temp.notReturned ) / IF (( temp.alarmEquipTotalNum = 0 ), 1, temp.alarmEquipTotalNum )), 2 ) * 100
+                    TRUNCATE ( abs(( temp.alarmEquipTotalNum - temp.notReturned ) / IF (( temp.alarmEquipTotalNum = 0 ), 1, temp.alarmEquipTotalNum )) * 100 , 2 )
                 ) AS returnAbs
         FROM
             (