Merge remote-tracking branch 'origin/dev_bugfix_ljj'

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -72,7 +72,7 @@
               and c.CATEGORY_CODE like CONCAT(#{categoryCode},'%')
           </if>
         </where>
-        order by e.CREATED_TIME desc
+        order by e.happen_time desc
     </select>
     <select id="listMonthlyEventCount" resultType="com.epmet.dto.result.IcEventMonthlyCountResultDTO">
         select t.monthName, count(1) eventCount
@@ -211,10 +211,10 @@
             AND ie.mobile = #{mobile}
         </if>
         <if test="startTime != null and startTime != '' ">
-            AND DATE_FORMAT(ie.created_time,"%Y-%m-%d %H:%i") <![CDATA[>=]]> #{startTime}
+            AND DATE_FORMAT(ie.happen_time,"%Y-%m-%d %H:%i") <![CDATA[>=]]> #{startTime}
         </if>
         <if test="endTime != null and endTime != '' ">
-            AND DATE_FORMAT(ie.created_time,"%Y-%m-%d %H:%i") <![CDATA[<=]]> #{endTime}
+            AND DATE_FORMAT(ie.happen_time,"%Y-%m-%d %H:%i") <![CDATA[<=]]> #{endTime}
         </if>
         <if test="status != null and status != '' ">
             AND ie.`status` = #{status}