非机预警列表整改,发布信息列表加排序

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

@@ -509,6 +509,7 @@
         WHERE    DATE_FORMAT(w.warning_time,'%Y-%m-%d') = DATE_FORMAT(#{warningTime},'%Y-%m-%d')
          and w.warning_source=6
          GROUP BY   w.stake_mark ) AS w_count ON s.stake_mark = w_count.stake_mark
+       where s.facility_type=1
     </select>
     <select id="selectNonAutomaticWarningFacilityMonth" resultType="java.util.HashMap">
         select facility_name as facilityName, COALESCE(w_count.number, 0) AS number
@@ -517,6 +518,7 @@
         WHERE    DATE_FORMAT(w.warning_time,'%Y-%m') = DATE_FORMAT(#{warningTime},'%Y-%m')
         and w.warning_source=6
         GROUP BY   w.stake_mark ) AS w_count ON s.stake_mark = w_count.stake_mark
+        where s.facility_type=1
     </select>
     <select id="selectNonAutomaticWarningFacilityYear" resultType="java.util.HashMap">
         select facility_name as facilityName, COALESCE(w_count.number, 0) AS number
@@ -525,6 +527,7 @@
          WHERE    DATE_FORMAT(w.warning_time,'%Y') = DATE_FORMAT(#{warningTime},'%Y')
          and w.warning_source=6
         GROUP BY   w.stake_mark ) AS w_count ON s.stake_mark = w_count.stake_mark
+        where s.facility_type=1
     </select>
 
 

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

@@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         GROUP BY manage.event_id
+        ORDER BY manage.create_time
     </select>
     
     <select id="selectDcPublishManageById" parameterType="Long" resultMap="DcPublishManageResult">