巡检点app查询bug

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireRiskSourceMapper.xml

@@ -7,6 +7,7 @@
             rs.mrid,
             rs.`name`,
             rs.parent_mrid,
+            rs.risk_level_mrid,
             IFNULL(rs.rpn, 0) rpn,
             IFNULL(rs.rpni, 0) rpni
         FROM `asf_fire_risk_source` rs

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

@@ -627,6 +627,7 @@
 			LEFT JOIN p_input_item pii ON pii.id = ppii.input_item_id
 		WHERE prp.point_id = #{pointId}
 		AND prp.route_id =#{routeId}
+		AND NOT FIND_IN_SET(prpi.point_input_item_id,prp.exclude_items)
 		ORDER BY
 			prpi.order_no
 

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

@@ -71,8 +71,10 @@
 			p_point_inputitem pi
 		LEFT JOIN p_input_item ii ON ii.id = pi.input_item_id
 		LEFT JOIN p_point_classify pc ON FIND_IN_SET(pc.id, pi.classify_ids) > 0
+		LEFT JOIN p_route_point prp ON prp.point_id = pi.point_id
 		WHERE
 		pi.point_id = #{pointId}
+		AND NOT FIND_IN_SET(pi.id,prp.exclude_items)
 		ORDER BY
 		    pi.order_no
     </select>