消防巡查增加巡查内容字段

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

@@ -281,30 +281,32 @@
 
     <select id="getPlanTaskCheckInfo" resultMap="checkInfoMap">
         SELECT
-            b.id,
-            e.NAME route_name,
-            d.NAME point_name,
-            a.user_name user_name,
-            wws.NAME address,
-            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.name plan_name
+        b.id,
+        e.name route_name,
+        d.name point_name,
+        ( CASE b.is_finish WHEN 1 THEN pc.user_name ELSE a.user_name END ) user_name,  -- 修改为执行人
+        (SELECT GROUP_CONCAT(ppc.`name`) FROM p_point_classify ppc WHERE ppc.point_id =d.id) as content,--添加巡检内容
+        (SELECT GROUP_CONCAT(DISTINCT ppc.address) FROM p_point_classify ppc WHERE ppc.point_id = d.id) as address, --修改点位置
+        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.name plan_name
         FROM
-            p_plan_task_detail b
-                LEFT JOIN p_plan_task a ON a.id = b.task_no
-                LEFT JOIN p_plan c ON c.id = a.plan_id
-                LEFT JOIN p_point d ON d.id = b.point_id
-                LEFT JOIN p_route e ON e.id = a.route_id
-                LEFT JOIN wl_warehouse_structure wws ON wws.id = d.risk_source_id
-                LEFT JOIN p_check pc ON pc.plan_task_detail_id = b.id
+        p_plan_task_detail b
+        LEFT JOIN p_plan_task a ON a.id = b.task_no
+        LEFT JOIN p_plan c ON c.id = a.plan_id
+        LEFT JOIN p_point d ON d.id = b.point_id
+        LEFT JOIN p_route e ON e.id = a.route_id
+        LEFT JOIN wl_warehouse_structure wws ON wws.id = d.risk_source_id
+        LEFT JOIN p_check pc ON pc.plan_task_detail_id = b.id
         <where>
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 and  a.org_code LIKE CONCAT(#{bizOrgCode},'%')
             </if>
             and DATE_FORMAT( a.check_date, '%Y-%m-%d' ) = CURRENT_DATE ()
         </where>
+        ORDER BY checkDate DESC;
         <choose>
             <when test="pageSize==-1"></when>
             <when test="pageSize!=-1">limit #{offset}, #{pageSize}</when>