Pārlūkot izejas kodu

禅道bug-四长距离NAN问题

hanfucheng 1 gadu atpakaļ
vecāks
revīzija
153c2c3fc6

+ 4 - 4
src/main/resources/mapper/commandcenter/CommandCentreMapper.xml

@@ -25,7 +25,7 @@
     </select>
 
     <select id="getFourLengthPatrolDistance" parameterType="CommandCenterBO" resultType="map">
-        SELECT '林长巡视里程' name,IFNULL(TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM	Round( sum(t2.length) / 1000 ))),0) num
+        SELECT '林长巡视里程' name,IFNULL(Round( sum(t2.length) / 1000),0) num
         FROM (SELECT a.id,a.create_time FROM centerdata_t_hydraulic_patrol_task a LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
         WHERE a.type = '1'
         <if test="deptId != null and deptId != ''">
@@ -39,7 +39,7 @@
         LEFT JOIN centerdata_t_hydraulic_patrol_track b ON b.record_id = a.id ORDER BY b.create_time) a,(SELECT @j := 0) AS itable) b ON a.xh = b.xh
         AND a.task_id = b.task_id) c GROUP BY task_id) t2 ON t2.task_id = t1.id
         UNION ALL
-        SELECT '河长巡视里程' name,IFNULL(TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM	Round( sum(t2.length) / 1000 ))),0) num
+        SELECT '河长巡视里程' name,IFNULL(Round( sum(t2.length) / 1000),0) num
         FROM (SELECT a.id,a.create_time FROM centerdata_t_hydraulic_patrol_task a LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
         WHERE a.type = '2'
         <if test="deptId != null and deptId != ''">
@@ -53,7 +53,7 @@
         LEFT JOIN centerdata_t_hydraulic_patrol_track b ON b.record_id = a.id ORDER BY b.create_time) a,(SELECT @j := 0) AS itable) b ON a.xh = b.xh
         AND a.task_id = b.task_id) c GROUP BY task_id) t2 ON t2.task_id = t1.id
         UNION ALL
-        SELECT '路长巡视里程' name,IFNULL(TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM	Round( sum(t2.length) / 1000 ))),0) num
+        SELECT '路长巡视里程' name,IFNULL(Round( sum(t2.length) / 1000),0) num
         FROM (SELECT a.id,a.create_time FROM centerdata_t_hydraulic_patrol_task a LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
         WHERE a.type = '3'
         <if test="deptId != null and deptId != ''">
@@ -67,7 +67,7 @@
         LEFT JOIN centerdata_t_hydraulic_patrol_track b ON b.record_id = a.id ORDER BY b.create_time) a,(SELECT @j := 0) AS itable) b ON a.xh = b.xh
         AND a.task_id = b.task_id) c GROUP BY task_id) t2 ON t2.task_id = t1.id
         UNION ALL
-        SELECT '田长巡视里程' name,IFNULL(TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM	Round( sum(t2.length) / 1000 ))),0) num
+        SELECT '田长巡视里程' name,IFNULL(Round( sum(t2.length) / 1000),0) num
         FROM (SELECT a.id,a.create_time FROM centerdata_t_hydraulic_patrol_task a LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
         WHERE a.type = '6'
         <if test="deptId != null and deptId != ''">