Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop

zc-business/src/main/java/com/zc/business/domain/DcEvent.java

@@ -231,6 +231,14 @@ public class DcEvent extends BaseEntity {
  private List<DcProcessConfig> processConfigList;
 @ApiModelProperty("事件标题")
     private String eventTitle;
+/**
+ * 2014/2/21新增
+ */
+
+@ApiModelProperty("所属预案")
+    private Long emergencyPlansId;
+
+
 
     /**
      *

zc-business/src/main/resources/mapper/business/DcEventMapper.xml

@@ -32,6 +32,7 @@
             <result property="lang"    column="lang"    />
             <result property="eventTitle"    column="event_title"    />
             <result property="occurrenceTime"    column="occurrence_time"    />
+            <result property="emergencyPlansId"    column="emergency_plans_id"    />
         </resultMap>
 
     <resultMap type="map" id="countMap">
@@ -65,6 +66,7 @@
             <result property="nodeNode"    column="node_node"    />
             <result property="roadId"    column="road_id"    />
             <result property="occurrenceTime"    column="occurrence_time"    />
+            <result property="emergencyPlansId"    column="emergency_plans_id"    />
         <result property="eventTitle"    column="event_title"    />
             <result property="commonPhrases"    column="common_phrases"    />
         <result property="stringEventType"    column="stringEventType"    />
@@ -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 @@
                 <if test="eventNature != null "> and event_nature = #{eventNature}</if>
                 <if test="eventSourceTips != null  and eventSourceTips != ''"> and event_source_tips = #{eventSourceTips}</if>
                 <if test="inTunnel != null "> and in_tunnel = #{inTunnel}</if>
+                <if test="emergencyPlansId != null "> and emergency_plans_id = #{emergencyPlansId}</if>
             </where>
 
         </select>
@@ -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 @@
                 <if test="lang != null">lang,</if>
                 <if test="eventTitle != null">event_title,</if>
                 <if test="occurrenceTime != null">occurrence_time,</if>
+                <if test="emergencyPlansId != null">emergency_plans_id,</if>
             </trim>
             <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="id != null">#{id},</if>
@@ -526,6 +533,7 @@
                 <if test="lang != null">#{lang},</if>
                 <if test="eventTitle != null">#{eventTitle},</if>
                 <if test="occurrenceTime != null">#{occurrenceTime},</if>
+                <if test="emergencyPlansId != null">#{emergencyPlansId},</if>
             </trim>
         </insert>
 
@@ -556,6 +564,7 @@
                 <if test="lang != null">road_id = #{lang},</if>
                 <if test="eventTitle != null">event_title = #{eventTitle},</if>
                 <if test="occurrenceTime != null">occurrence_time = #{occurrenceTime},</if>
+                <if test="emergencyPlansId != null">emergency_plans_id = #{emergencyPlansId},</if>
             </trim>
             where id = #{id}
         </update>