Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp

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,

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