浙江设备平台接口开发

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -290,7 +290,8 @@
             date_format( pc.check_time, '%Y-%m-%d %H:%i:%s' ) checkDate,
             ( CASE b.is_finish WHEN 0 THEN '未执行' WHEN 1 THEN '已执行' ELSE '未执行' END ) AS `Finish_Status`,
             ( CASE b.is_finish WHEN 0 THEN '尚未巡检' WHEN 1 THEN '按时完成' ELSE '超时漏检' END ) AS `is_ok`,
-            c.biz_org_name AS department_name
+            c.biz_org_name AS department_name,
+            c.plan_name
         FROM
             p_plan_task_detail b
                 LEFT JOIN p_plan_task a ON a.id = b.task_no
@@ -316,8 +317,8 @@
         a.id,
         c.`name` plan_name,
         a.user_name user_name,
-            Round( a.finish_num / a.point_num, 2 ) sched,
-            a.begin_time beginTime ,
+        CONCAT( IF ( a.finish_num = '0', 0, Round( a.finish_num / a.point_num, 2 )), '%' ) sched,
+        a.begin_time beginTime,
         a.end_time endTime,
         ( CASE a.finish_status WHEN 0 THEN '未开始' WHEN 1 THEN '进行中' WHEN 2 THEN '已结束' ELSE '已超时' END ) AS `Finish_Status`
         FROM