Merge branch 'develop_dl_plan6_temp_merge_colony' of…

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -672,7 +672,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			case "314":
 				alertCalledMapper.update(null,
 						new UpdateWrapper<AlertCalled>().eq("sequence_nbr", id).set("alert_status", 1)
-								.set("alert_stage", AlertStageEnums.ZBQJ.getValue()).set("update_time", new Date())
+								.set("alert_stage", AlertStageEnums.CZJS.getValue()).set("update_time", new Date())
 								.set("alarm_type", AlertStageEnums.FJQ.getValue())
 								.set("alarm_type_code", AlertStageEnums.FJQ.getCode()));
 				break;

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

@@ -12,7 +12,8 @@
 		LEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id,
 		 (
 			SELECT
-				id AS route_point_id
+				id AS route_point_id,
+		exclude_items
 			FROM
 				p_route_point rp
 		        <where>
@@ -22,6 +23,7 @@
 		) prp
 		WHERE
 			prp.route_point_id = prpi.route_point_id
+		AND IF(prp.route_point_id, NOT FIND_IN_SET(pii.id,IFNULL(prp.exclude_items,'')),' 1=1 ')
     </select>
     
     <resultMap id="routePointInputItemMap" type="com.yeejoin.amos.patrol.dao.entity.PointInputItem">