diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java index 1bb5a05b..9140d798 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java @@ -231,6 +231,14 @@ public class DcEvent extends BaseEntity { private List processConfigList; @ApiModelProperty("事件标题") private String eventTitle; +/** + * 2014/2/21新增 + */ + +@ApiModelProperty("所属预案") + private Long emergencyPlansId; + + /** * diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml index 0cfd9128..b69ee69e 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml @@ -32,6 +32,7 @@ + @@ -65,6 +66,7 @@ + @@ -152,6 +154,7 @@ event_level, event_type, event_title, + emergency_plans_id, CASE event_type WHEN '1' THEN '交通事故' WHEN '2' THEN '车辆故障' @@ -277,6 +280,7 @@ dc_event.in_tunnel, dc_event.road_id, dc_event.event_title, + dc_event.emergency_plans_id, dc_event_type.event_name AS event_name, dc_process_config.node_node AS node_node, @@ -325,6 +329,7 @@ and event_nature = #{eventNature} and event_source_tips = #{eventSourceTips} and in_tunnel = #{inTunnel} + and emergency_plans_id = #{emergencyPlansId} @@ -362,6 +367,7 @@ dc_event.estimated_end_time, dc_event.event_level, dc_event.event_title, + dc_event.emergency_plans_id, dc_event.occurrence_time, dc_event.event_type AS event_type, CASE dc_event.event_type @@ -499,6 +505,7 @@ lang, event_title, occurrence_time, + emergency_plans_id, #{id}, @@ -526,6 +533,7 @@ #{lang}, #{eventTitle}, #{occurrenceTime}, + #{emergencyPlansId}, @@ -556,6 +564,7 @@ road_id = #{lang}, event_title = #{eventTitle}, occurrence_time = #{occurrenceTime}, + emergency_plans_id = #{emergencyPlansId}, where id = #{id}