From 79079a6df0e9e7e5da528c8a1615ae69a55b838d Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Fri, 26 Apr 2024 20:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=9C=BA=E9=A2=84=E8=AD=A6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B4=E6=94=B9,=E5=8F=91=E5=B8=83=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/DcPerceivedEventsWarningMapper.xml         | 3 +++
 .../main/resources/mapper/business/DcPublishManageMapper.xml   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index d19b3ef0..5bbe6174 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/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>
 
 
diff --git a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
index 37833f47..e9341438 100644
--- a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml
+++ b/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">