From 585e640f969b2269288ecaa719f11fa6ed744ed0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 27 Aug 2020 15:24:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=94=AF=E9=83=A8=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=20=E5=8F=AA=E5=8F=96=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenDifficultyDataDao.xml | 2 +- .../src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml index 7d166fc31f..630befedcd 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml @@ -9,7 +9,7 @@ diff.EVENT_ID AS projectId, diff.EVENT_CONTENT AS title, diff.EVENT_STATUS_CODE AS STATUS, - FORMAT(diff.EVENT_COST_TIME/60,0) AS totalHours, + ROUND(diff.EVENT_COST_TIME/60,0) AS totalHours, DATE_FORMAT( eve.EVENT_CREATE_TIME, '%Y-%m-%d %H:%i' ) AS createDateTime, diff.EVENT_SOURCE AS gridName, diff.EVENT_IMG_URL AS imgUrl, diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml index 619d47ae48..3d6719522e 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml @@ -17,6 +17,7 @@ screen_org_rank_data WHERE DEL_FLAG = '0' + AND ORG_TYPE = 'grid' AND PARENT_ID = #{agencyId} AND MONTH_ID = #{monthId} ORDER BY