大屏导出-保留两位小数

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java

@@ -272,7 +272,7 @@ public class ScreenDeptEventStatServiceImpl extends BaseServiceImpl<ScreenDeptEv
      */
     private List<EventStatisticsResultDTO> getOnTimeDealInfo(EventStatisticsFormDTO formDTO,List<EventStatisticsResultDTO> resultDTOList){
         List<OnTimeDealInfoResultDTO> resultDto = baseDao.getOnTimeDealInfo(formDTO);
-        // 组装满意度信息
+        // 组装按期办结信息
         for(EventStatisticsResultDTO totalDto : resultDTOList){
             for(OnTimeDealInfoResultDTO childDto : resultDto){
                 if(totalDto.getDeptId().equals(childDto.getDeptId())){

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml

@@ -249,7 +249,7 @@
         SELECT
             a.id AS deptId,
             IFNULL(SUM(b.value), 0) AS value,
-            concat(ROUND(IFNULL(SUM(b.value) / SUM(b.total) * 100 , 0) ,1 ),'%') as proportion
+            concat(ROUND(IFNULL(SUM(b.value) / SUM(b.total) * 100 , 0) ,2 ),'%') as proportion
         FROM meta_sys_dept a
         left join (
             select
@@ -300,7 +300,7 @@
         SELECT
         a.id AS deptId,
         IFNULL(SUM(b.value), 0) AS value,
-        concat(ROUND(IFNULL(SUM(b.value) / SUM(b.total) * 100 , 0) ,1 ),'%') as proportion
+        concat(ROUND(IFNULL(SUM(b.value) / SUM(b.total) * 100 , 0) ,2 ),'%') as proportion
         FROM meta_sys_dept a
         left join (
             SELECT
@@ -320,13 +320,13 @@
                     and DEL_FLAG = '0'
                     and HANDLER_DEPT = '网格化平台'
                 )
+                limit 1
             ) process on process.ITEM_ID = item.ID
             where item.DEL_FLAG = '0'
             and item.ITEM_STATE = '10'
             and item.IS_PEOPLE = '1'
             and item.EVENT_ID is null
             and item.ISSUE_ID is null
-            and item.EVALUATION_SCORE is not null
             and ((SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2')))
             <if test='"1" == statType'>
                 AND DATE_FORMAT(item.CREATED_TIME, '%Y-%m-%d') &lt;= #{statDate}
@@ -438,12 +438,12 @@
             a.sort                            AS deptSort,
             IFNULL(SUM(b.eventCount), 0)      AS 'eventCount',
             IFNULL(SUM(b.closedCount), 0)     AS 'closedCount',
-            CONCAT(ROUND(IFNULL(SUM(b.closedCount) / SUM(b.eventCount) * 100,0),1),'%') as closedRatio,
+            CONCAT(ROUND(IFNULL(SUM(b.closedCount) / SUM(b.eventCount) * 100,0),2),'%') as closedRatio,
             IFNULL(SUM(b.livelihoodCount), 0) AS 'livelihoodCount',
             IFNULL(SUM(b.developCount), 0)    AS 'developCount',
             IFNULL(SUM(b.lawCount), 0)        AS 'lawCount',
             IFNULL(SUM(b.responseCount), 0)   AS 'responseCount',
-            CONCAT(ROUND(IFNULL(SUM(b.responseCount) / SUM(b.eventCount) * 100,0),1),'%') as responseRatio,
+            CONCAT(ROUND(IFNULL(SUM(b.responseCount) / SUM(b.eventCount) * 100,0),2),'%') as responseRatio,
             IFNULL(SUM(b.unAcceptCount), 0)   AS 'unAcceptCount',
             IFNULL(SUM(b.gridCommunityDealNum), 0)   AS 'gridCommunityDealNum'
         FROM meta_sys_dept a
@@ -451,10 +451,10 @@
             SELECT
                 a.ALL_DEPT_IDS,
                 COUNT(a.ID)                                        AS 'eventCount',
-                CASE WHEN a.ITEM_STATE = '10' THEN COUNT(a.ID) END AS 'closedCount',
-                CASE a.PEOPLE_FLAG WHEN '0' THEN COUNT(a.ID) END   AS 'livelihoodCount',
-                CASE a.PEOPLE_FLAG WHEN '1' THEN COUNT(a.ID) END   AS 'developCount',
-                CASE a.PEOPLE_FLAG WHEN '2' THEN COUNT(a.ID) END   AS 'lawCount',
+                COUNT(a.ITEM_STATE = '10' or null) AS 'closedCount',
+                COUNT(a.PEOPLE_FLAG = '0' or null) AS 'livelihoodCount',
+                COUNT(a.PEOPLE_FLAG = '1' or null) AS 'developCount',
+                COUNT(a.PEOPLE_FLAG = '2' or null) AS 'lawCount',
                 COUNT(c.ITEM_ID)                                   AS 'responseCount',
                 COUNT(d.ITEM_ID)                                   AS 'unAcceptCount',
                 COUNT(e.ITEM_ID)                                   AS 'gridCommunityDealNum'