diff --git a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java
index 0b426534..15b9f658 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java
@@ -105,6 +105,7 @@ public class DCPerceivedEventsWarningController extends BaseController {
         if (StringUtils.isBlank(type)||StringUtils.isBlank(sectionId)||createTime==null||StringUtils.isBlank(direction)){
             return AjaxResult.error("参数数据异常");
         }
+        dcWarning.setWarningTime(createTime);
         return AjaxResult.success(perceivedEventsWarningService.selectWarningTrend(dcWarning));
     }
     //某一路段某一时间段的感知事件类型占比
@@ -118,6 +119,7 @@ public class DCPerceivedEventsWarningController extends BaseController {
         if (StringUtils.isBlank(type)||StringUtils.isBlank(sectionId)||createTime==null||StringUtils.isBlank(direction)){
             return AjaxResult.error("参数数据异常");
         }
+        dcWarning.setWarningTime(createTime);
         if (type.equals("quarter")) {
             String total = perceivedEventsWarningService.selectWarningSectionTypeCountQuarter(dcWarning);
             map.put("total",total);
@@ -140,6 +142,9 @@ public class DCPerceivedEventsWarningController extends BaseController {
         if (StringUtils.isBlank(direction)){
             return AjaxResult.error("参数异常");
         }
+        if (dcWarning.getCreateTime()!=null){
+            dcWarning.setWarningTime(dcWarning.getCreateTime());
+        }
         return AjaxResult.success(perceivedEventsWarningService.selectSectionMarkOptimize(dcWarning));
     }
     //查询某个路段下的全部桩号
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
index ec4f5fd5..3d935316 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
@@ -94,6 +94,27 @@ public class DcWarning extends BaseEntity
     @Excel(name = "持续时长(秒)")
     private int duration;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date endTime;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     public int getDuration() {
         return duration;
     }
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java
index 633c24e4..3f23fb6a 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java
@@ -53,7 +53,7 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
     public List<HashMap<String,Object>> selectSectionPerceivedEventsList( )  {
         DcWarning dcWarning = new DcWarning();
         Date nowDate = DateUtils.getNowDate();
-        dcWarning.setCreateTime(nowDate);
+        dcWarning.setWarningTime(nowDate);
         List<HashMap<String,Object>> dcWarnings = perceivedEventsWarningMapper.selectSectionPerceivedEventsList(dcWarning);
         return dcWarnings;
     }
@@ -62,7 +62,7 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
     public List<HashMap<String, Object>> selectSectionPerceivedNumber( ) {
         DcWarning dcWarning = new DcWarning();
         Date nowDate = DateUtils.getNowDate();
-        dcWarning.setCreateTime(nowDate);
+        dcWarning.setWarningTime(nowDate);
         return perceivedEventsWarningMapper.selectSectionPerceivedNumber(dcWarning);
     }
     //查询当前日,日累计感知事件，按照小时进行分组
@@ -81,7 +81,7 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
     public List<HashMap<String, Object>> selectWarningSourceGroup() {
         DcWarning dcWarning = new DcWarning();
         Date nowDate = DateUtils.getNowDate();
-        dcWarning.setCreateTime(nowDate);
+        dcWarning.setWarningTime(nowDate);
         return perceivedEventsWarningMapper.selectWarningSourceGroup(dcWarning);
     }
 
@@ -89,7 +89,7 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
     public String selectWarningSourceGroupCount() {
         DcWarning dcWarning = new DcWarning();
         Date nowDate = DateUtils.getNowDate();
-        dcWarning.setCreateTime(nowDate);
+        dcWarning.setWarningTime(nowDate);
         return perceivedEventsWarningMapper.selectWarningSourceGroupCount(dcWarning);
     }
 
diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index 3cc81559..98627d4d 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
@@ -35,14 +35,19 @@
         warning.`other_config` FROM dc_warning AS warning
         left JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark and mark.direction=warning.direction
         <where>
-            <if test="warningType != null  and warningType != ''"> and warning_type = #{warningType}</if>
-            <if test="warningSubclass != null  and warningSubclass != ''"> and warning_subclass = #{warningSubclass}</if>
+            <if test="warningType != null  and warningType != ''"> and warning.warning_type = #{warningType}</if>
+            <if test="warningSubclass != null  and warningSubclass != ''"> and warning.warning_subclass = #{warningSubclass}</if>
+            <if test="warningSource != null  and warningSource != ''"> and warning.warning_source = #{warningSource}</if>
+            <if test="direction != null  and direction != ''"> and warning.direction = #{direction}</if>
+            <if test="stakeMark != null  and direction != ''"> and warning.stake_mark = #{stakeMark}</if>
+            <if test="startTime != null  and endTime != null ">
+             and warning.warning_time between #{startTime} and #{endTime}</if>
         </where>
     </select>
     <select id="selectSectionPerceivedEventsList" resultType="hashmap">
         select s.section_name sectionName,
         (select COUNT(1) FROM `dc_warning` as w  where
-        DATE_FORMAT(w.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+        DATE_FORMAT(w.warning_time,'%Y-%m-%d')=DATE_FORMAT(#{warningTime},'%Y-%m-%d')
         and mark.stake_mark=w.stake_mark)number from dc_warning as w
         left JOIN  dc_stake_mark as mark  ON mark.stake_mark=w.stake_mark and mark.direction=w.direction
         LEFT JOIN dc_road_section as s ON mark.section_id=s.id
@@ -54,7 +59,7 @@
     <select id="selectSectionPerceivedNumber" resultType="java.util.HashMap">
         select s.section_name sectionName,
        (select COUNT(1) FROM `dc_warning` as w  where
-       DATE_FORMAT(w.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+       DATE_FORMAT(w.warning_time,'%Y-%m-%d')=DATE_FORMAT(#{warningTime},'%Y-%m-%d')
        and mark.stake_mark=w.stake_mark)number from dc_warning as w
         left JOIN  dc_stake_mark as mark  ON mark.stake_mark=w.stake_mark and mark.direction=w.direction
         LEFT JOIN dc_road_section as s ON mark.section_id=s.id
@@ -63,28 +68,28 @@
         HAVING   number !=0
     </select>
     <select id="selectDailyCumulative" resultType="java.util.HashMap">
-        SELECT DATE_FORMAT(create_time, '%Y-%m-%d %H') AS time, COUNT(*) AS number
+        SELECT DATE_FORMAT(warning_time, '%Y-%m-%d %H') AS time, COUNT(*) AS number
         FROM dc_warning
-        WHERE create_time >= CURDATE() AND create_time <![CDATA[<]]> CURDATE() + INTERVAL 1 DAY
+        WHERE warning_time >= CURDATE() AND warning_time <![CDATA[<]]> CURDATE() + INTERVAL 1 DAY
         GROUP BY time
         ORDER BY time
     </select>
     <select id="selectDailyCumulativeMonth" resultType="java.util.HashMap">
-        SELECT HOUR(create_time) AS time, COUNT(*) AS number
+        SELECT HOUR(warning_time) AS time, COUNT(*) AS number
         FROM dc_warning
-        WHERE MONTH(create_time) = MONTH(CURDATE())
-          AND YEAR(create_time) = YEAR(CURDATE())
-        GROUP BY HOUR(create_time)
-        ORDER BY HOUR(create_time);
+        WHERE MONTH(warning_time) = MONTH(CURDATE())
+          AND YEAR(warning_time) = YEAR(CURDATE())
+        GROUP BY HOUR(warning_time)
+        ORDER BY HOUR(warning_time);
     </select>
     <select id="selectWarningSourceGroup" resultType="java.util.HashMap">
         SELECT warning_source warningSource,COUNT(*) AS number FROM dc_warning
-        where DATE_FORMAT(create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+        where DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(#{warningTime},'%Y-%m-%d')
         GROUP BY warning_source
     </select>
     <select id="selectWarningSourceGroupCount" resultType="java.lang.String">
         SELECT COUNT(*) AS number FROM dc_warning
-        where DATE_FORMAT(create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+        where DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(#{warningTime},'%Y-%m-%d')
     </select>
     <select id="selectWarningStateDay" resultType="java.util.HashMap">
         select t1.warningState,t1.warningStateName,IFNULL(t2.num,0)number  from
@@ -95,7 +100,7 @@
                 LEFT JOIN
             (SELECT warning_state warningState,count(*) num
              from dc_warning
-             where DATE_FORMAT(create_time,'%Y-%m-%d')=DATE_FORMAT(now(),'%Y-%m-%d')
+             where DATE_FORMAT(warning_time,'%Y-%m-%d')=DATE_FORMAT(now(),'%Y-%m-%d')
              GROUP BY warning_state)t2
             on t1.warningState=t2.warningState
     </select>
@@ -105,19 +110,19 @@
         ORDER BY number DESC
     </select>
     <select id="selectWarningTrendDay" resultType="java.util.HashMap">
-        SELECT DATE_FORMAT(warning.create_time, '%Y-%m-%d %H') AS time, COUNT(*) AS number
+        SELECT DATE_FORMAT(warning.warning_time, '%Y-%m-%d %H') AS time, COUNT(*) AS number
         FROM dc_warning AS warning
         LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
-        WHERE  DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+        WHERE  DATE_FORMAT(warning.warning_time,'%Y-%m-%d')=DATE_FORMAT(#{warningTime},'%Y-%m-%d')
           AND warning.direction=#{direction} and mark.direction=#{direction}
           AND mark.`section_id`=#{sectionId}
         GROUP BY time
     </select>
     <select id="selectWarningTrendMonth" resultType="java.util.HashMap">
-        SELECT DATE(warning.create_time) AS day, COUNT(*) AS number
+        SELECT DATE(warning.warning_time) AS day, COUNT(*) AS number
         FROM dc_warning as warning
         LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
-        WHERE DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
+        WHERE DATE_FORMAT(warning.warning_time,'%Y-%m') =DATE_FORMAT(#{warningTime},'%Y-%m')
           AND warning.direction=#{direction} and mark.direction=#{direction}
           and mark.`section_id`=#{sectionId}
         GROUP BY day
@@ -126,16 +131,16 @@
     <select id="selectWarningTrendQuarter" resultType="java.util.HashMap">
         SELECT
             CASE
-                WHEN MONTH(warning.create_time) BETWEEN 1 AND 3 THEN '第一季度'
-                WHEN MONTH(warning.create_time) BETWEEN 4 AND 6 THEN '第二季度'
-                WHEN MONTH(warning.create_time) BETWEEN 7 AND 9 THEN '第三季度'
+                WHEN MONTH(warning.warning_time) BETWEEN 1 AND 3 THEN '第一季度'
+                WHEN MONTH(warning.warning_time) BETWEEN 4 AND 6 THEN '第二季度'
+                WHEN MONTH(warning.warning_time) BETWEEN 7 AND 9 THEN '第三季度'
                 ELSE '第四季度'
                 END AS QUARTER,
-            MONTH(warning.create_time) AS month,
+            MONTH(warning.warning_time) AS month,
             COUNT(*) AS number
         FROM dc_warning as warning
         LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
-        WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
+        WHERE YEAR(warning.warning_time) =DATE_FORMAT(#{warningTime},'%Y')
           AND warning.direction=#{direction} and mark.direction=#{direction}
           and mark.`section_id`=#{sectionId}
         GROUP BY QUARTER, MONTH
@@ -143,17 +148,17 @@
 
     </select>
     <select id="selectWarningTrendYear" resultType="java.util.HashMap">
-        SELECT month(warning.create_time) AS month, COUNT(*) AS number
+        SELECT month(warning.warning_time) AS month, COUNT(*) AS number
         FROM dc_warning as warning
         LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
         where  mark.`section_id`=#{sectionId}   AND warning.direction=#{direction} and mark.direction=#{direction}
-        and DATE_FORMAT(warning.create_time,'%Y')=DATE_FORMAT(#{createTime},'%Y')
+        and DATE_FORMAT(warning.warning_time,'%Y')=DATE_FORMAT(#{warningTime},'%Y')
         GROUP BY month
     </select>
     <select id="selectWarningSectionTypeDayCount" resultType="java.lang.String">
         SELECT  COUNT(*) AS number FROM dc_warning as warning
         LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.stake_mark
-        where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+        where DATE_FORMAT(warning.warning_time,'%Y-%m-%d')=DATE_FORMAT(#{warningTime},'%Y-%m-%d')
           AND warning.direction=#{direction} and mark.direction=#{direction}
           and   mark.`section_id`=#{sectionId}
     </select>
@@ -162,7 +167,7 @@
                COUNT(*) AS number
         FROM dc_warning as warning
         LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.stake_mark
-        where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+        where DATE_FORMAT(warning.warning_time,'%Y-%m-%d')=DATE_FORMAT(#{warningTime},'%Y-%m-%d')
           AND warning.direction=#{direction} and mark.direction=#{direction}
            and   mark.`section_id`=#{sectionId}
         GROUP BY warning_type
@@ -171,7 +176,7 @@
     <select id="selectWarningSectionTypeMonthCount" resultType="java.lang.String">
         SELECT COUNT(*) AS number FROM dc_warning as warning
          LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.stake_mark
-        where DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
+        where DATE_FORMAT(warning.warning_time,'%Y-%m') =DATE_FORMAT(#{warningTime},'%Y-%m')
           AND warning.direction=#{direction} and mark.direction=#{direction}
           and   mark.`section_id`=#{sectionId}
     </select>
@@ -179,7 +184,7 @@
         SELECT warning.warning_type warningType,COUNT(*) AS number
         FROM dc_warning as warning
         LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.stake_mark
-        where DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
+        where DATE_FORMAT(warning.warning_time,'%Y-%m') =DATE_FORMAT(#{warningTime},'%Y-%m')
           AND warning.direction=#{direction} and mark.direction=#{direction}
           and   mark.`section_id`=#{sectionId}
         GROUP BY warning_type
@@ -190,23 +195,23 @@
                COUNT(*) AS number
         FROM dc_warning as warning
                  LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
-        WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
+        WHERE YEAR(warning.warning_time) =DATE_FORMAT(#{warningTime},'%Y')
           AND warning.direction=#{direction} and mark.direction=#{direction}
           and mark.`section_id`=#{sectionId}
     </select>
     <select id="selectWarningSectionTypeQuarter" resultType="java.util.HashMap">
         SELECT
             CASE
-                WHEN MONTH(warning.create_time) BETWEEN 1 AND 3 THEN '第一季度'
-                WHEN MONTH(warning.create_time) BETWEEN 4 AND 6 THEN '第二季度'
-                WHEN MONTH(warning.create_time) BETWEEN 7 AND 9 THEN '第三季度'
+                WHEN MONTH(warning.warning_time) BETWEEN 1 AND 3 THEN '第一季度'
+                WHEN MONTH(warning.warning_time) BETWEEN 4 AND 6 THEN '第二季度'
+                WHEN MONTH(warning.warning_time) BETWEEN 7 AND 9 THEN '第三季度'
                 ELSE '第四季度'
                 END AS QUARTER,
             warning.warning_type warningType,
             COUNT(*) AS number
         FROM dc_warning as warning
                  LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
-        WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
+        WHERE YEAR(warning.warning_time) =DATE_FORMAT(#{warningTime},'%Y')
           AND warning.direction=#{direction} and mark.direction=#{direction}
           and mark.`section_id`=#{sectionId}
         GROUP BY QUARTER, warningType
@@ -216,7 +221,7 @@
         SELECT COUNT(*) AS number FROM dc_warning as warning
         LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
         where  mark.`section_id`=#{sectionId}   AND warning.direction=#{direction} and mark.direction=#{direction}
-          and   DATE_FORMAT(warning.create_time,'%Y')=DATE_FORMAT(#{createTime},'%Y')
+          and   DATE_FORMAT(warning.warning_time,'%Y')=DATE_FORMAT(#{warningTime},'%Y')
 
     </select>
     <select id="selectWarningSectionTypeYear" resultType="java.util.HashMap">
@@ -224,7 +229,7 @@
         FROM dc_warning as warning
         LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
         where  mark.`section_id`=#{sectionId}   AND warning.direction=#{direction} and mark.direction=#{direction}
-         and   DATE_FORMAT(warning.create_time,'%Y')=DATE_FORMAT(#{createTime},'%Y')
+         and   DATE_FORMAT(warning.warning_time,'%Y')=DATE_FORMAT(#{warningTime},'%Y')
         GROUP BY warningType
     </select>
 
@@ -236,7 +241,7 @@
     </select>
     <select id="selectWarningEscalation" resultType="java.util.HashMap">
         select org.organization_name,warning.warning_type,warning.warning_subclass,
-        warning_title,warning.warning_state,
+        warning_title,warning.warning_state,DATE_FORMAT(warning.warning_time,'%Y-%m-%d %H:%m:%s') warningTime,
         warning. warning_source,DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%m:%s') createTime from dc_warning as warning
         LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.stake_mark and mark.direction=warning.direction
         LEFT JOIN dc_organization as org on mark.stake_mark=org.stake_mark
@@ -269,26 +274,26 @@
     </update>
     <select id="selectWarningMarkDay" resultType="java.lang.String">
         select count(1) from dc_warning where stake_mark=#{stakeMark}
-         AND direction=#{direction} and DATE(create_time)=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+         AND direction=#{direction} and DATE(warning_time)=DATE_FORMAT(#{warningTime},'%Y-%m-%d')
     </select>
     <select id="selectWarningMarkMonth" resultType="java.lang.String">
         select count(1) from dc_warning where stake_mark=#{stakeMark}
-          AND direction=#{direction} and  DATE_FORMAT(create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
+          AND direction=#{direction} and  DATE_FORMAT(warning_time,'%Y-%m') =DATE_FORMAT(#{warningTime},'%Y-%m')
     </select>
     <select id="selectWarningMarkYear" resultType="java.lang.String">
         select count(1) from dc_warning where stake_mark=#{stakeMark}
-        AND direction=#{direction} and  YEAR(create_time) =DATE_FORMAT(#{createTime},'%Y')
+        AND direction=#{direction} and  YEAR(warning_time) =DATE_FORMAT(#{warningTime},'%Y')
     </select>
     <select id="selectWarningMarkQuarter" resultType="hashmap">
         select count(1) number,stake_mark stakeMark,
                CASE
-                   WHEN MONTH(create_time) BETWEEN 1 AND 3 THEN '第一季度'
-                   WHEN MONTH(create_time) BETWEEN 4 AND 6 THEN '第二季度'
-                   WHEN MONTH(create_time) BETWEEN 7 AND 9 THEN '第三季度'
+                   WHEN MONTH(warning_time) BETWEEN 1 AND 3 THEN '第一季度'
+                   WHEN MONTH(warning_time) BETWEEN 4 AND 6 THEN '第二季度'
+                   WHEN MONTH(warning_time) BETWEEN 7 AND 9 THEN '第三季度'
                    ELSE '第四季度'
                    END AS QUARTER
         from dc_warning where stake_mark=#{stakeMark} and
-            YEAR(create_time) =DATE_FORMAT(#{createTime},'%Y')
+            YEAR(warning_time) =DATE_FORMAT(#{warningTime},'%Y')
             AND direction=#{direction} and stake_mark is not null
         GROUP BY QUARTER
         ORDER BY QUARTER;
@@ -300,24 +305,24 @@
     <select id="selectWarningMarkQuarterOptimize" resultType="java.util.HashMap">
         SELECT count( 1 ) sectionNumber,
             CASE
-                WHEN MONTH ( w.create_time ) BETWEEN 1 AND 3 THEN '第一季度'
-                WHEN MONTH ( w.create_time ) BETWEEN 4 AND 6 THEN '第二季度'
-                WHEN MONTH ( w.create_time ) BETWEEN 7 AND 9 THEN '第三季度'
+                WHEN MONTH ( w.warning_time ) BETWEEN 1 AND 3 THEN '第一季度'
+                WHEN MONTH ( w.warning_time ) BETWEEN 4 AND 6 THEN '第二季度'
+                WHEN MONTH ( w.warning_time ) BETWEEN 7 AND 9 THEN '第三季度'
                 ELSE '第四季度'
                 END AS QUARTER
         FROM dc_warning w
-        LEFT JOIN dc_stake_mark m ON w.stake_mark = m.stake_mark and mark.direction=warning.direction
+        LEFT JOIN dc_stake_mark m ON w.stake_mark = m.stake_mark and m.direction=w.direction
         WHERE m.stake_mark IS NOT null and w.direction=#{direction}
-          and  YEAR(w.create_time) =DATE_FORMAT(#{createTime},'%Y')
+          and  YEAR(w.warning_time) =DATE_FORMAT(#{warningTime},'%Y')
         GROUP BY QUARTER
         ORDER BY QUARTER;
     </select>
     <select id="selectWarningMarkDayOptimize" resultType="java.util.HashMap">
         SELECT DISTINCT m.stake_mark stakeMarkId,
         (SELECT count( 0 ) FROM dc_warning w WHERE w.stake_mark = m.stake_mark
-        <if test = 'type == "day"' >and DATE(w.create_time)= DATE_FORMAT(#{createTime},'%Y-%m-%d')</if>
-        <if test = 'type == "month"' >and  DATE_FORMAT(w.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')</if>
-        <if test = 'type == "year"' >and YEAR(w.create_time) =DATE_FORMAT(#{createTime},'%Y')</if>
+        <if test = 'type == "day"' >and DATE(w.warning_time)= DATE_FORMAT(#{warningTime},'%Y-%m-%d')</if>
+        <if test = 'type == "month"' >and  DATE_FORMAT(w.warning_time,'%Y-%m') =DATE_FORMAT(#{warningTime},'%Y-%m')</if>
+        <if test = 'type == "year"' >and YEAR(w.warning_time) =DATE_FORMAT(#{warningTime},'%Y')</if>
         AND w.direction = #{direction}) sectionNumber FROM dc_stake_mark AS m
         WHERE m.section_id = #{sectionId}
         HAVING sectionNumber!=0