From 4527cf75164cff679527cf2af60a3ba1e3457403 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 16 Sep 2021 10:07:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E9=9B=B7=E5=93=A5=E6=8F=90?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E9=9C=80=E6=B1=82=EF=BC=9A=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E9=82=A3=E4=B8=AA?= =?UTF-8?q?=E5=B0=8F=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index 3e058e209a..16c1b42383 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -282,6 +282,7 @@ screen_customer_agency sca WHERE sca.DEL_FLAG = '0' + and sca.IS_DISPLAY='1' AND sca.PARENT_AREA_CODE = #{areaCode} @@ -296,6 +297,7 @@ FROM screen_customer_grid m where m.DEL_FLAG = '0' + and m.IS_DISPLAY='1' and m.AREA_CODE=#{areaCode} From 5307a5d09ead5871e6bd7c319e5cafd65ab72dd7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Sep 2021 17:07:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=B0=8F=E7=BB=84V2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/group/ResiGroupDao.xml | 53 +++++++------------ 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 82d1531781..fd7e813840 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -108,41 +108,24 @@ topicContent, type FROM - ( - SELECT - a.ID AS textId, - a.TOPIC_CONTENT AS topicContent, - 'topic' AS type, - max( a.CREATED_TIME ) AS CREATED_TIME - FROM - resi_topic a - WHERE - a.GROUP_ID = #{groupId} - GROUP BY - a.GROUP_ID UNION ALL - SELECT - a.ID AS textId, - a.TITLE AS topicContent, - 'notice' AS type, - max( a.CREATED_TIME ) AS CREATED_TIME - FROM - notice a - WHERE - a.GROUP_ID = #{groupId} - GROUP BY - a.GROUP_ID UNION ALL - SELECT - a.ID AS textId, - a.TITLE AS topicContent, - 'activity' AS type, - max( a.CREATED_TIME ) AS CREATED_TIME - FROM - group_act_info a - WHERE - a.GROUP_ID = #{groupId} - GROUP BY - a.GROUP_ID - ) a + ( + SELECT + a.ID AS textId, + a.TOPIC_CONTENT AS topicContent, + 'topic' AS type, + a.CREATED_TIME + FROM + resi_topic a + INNER JOIN ( + SELECT max( CREATED_TIME ) AS CREATED_TIME + FROM resi_topic + WHERE GROUP_ID = #{groupId} + AND DEL_FLAG = '0' + ) b ON a.CREATED_TIME = b.CREATED_TIME + WHERE + a.DEL_FLAG = '0' + AND a.GROUP_ID = #{groupId} + ) a ORDER BY CREATED_TIME DESC LIMIT 1