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

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

@@ -282,10 +282,11 @@
     <select id="getPlanTaskCheckInfo" resultMap="checkInfoMap">
         SELECT
         b.id,
-            e.NAME route_name,
-            d.NAME point_name,
-            a.user_name user_name,
-            wws.NAME address,
+        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`,
@@ -305,6 +306,7 @@
             </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>