大屏导出办结数统计修改

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

@@ -234,28 +234,29 @@ public class ScreenDeptEventStatServiceImpl extends BaseServiceImpl<ScreenDeptEv
         List<EventStatisticsResultDTO> resultDTOList = baseDao.getScreenExportData(formDTO);
 
         // 组装满意度信息
-        resultDTOList = getSatisfiedInfo(formDTO,resultDTOList);
+        getSatisfiedInfo(formDTO, resultDTOList);
 
         // 获取按期办结信息
-        resultDTOList = getOnTimeDealInfo(formDTO,resultDTOList);
+        getOnTimeDealInfo(formDTO, resultDTOList);
 
         // 获取红黄灯预警数
-        resultDTOList = getYellowRedInfo(formDTO,resultDTOList);
+        getYellowRedInfo(formDTO, resultDTOList);
 
         return resultDTOList;
     }
 
     /**
      * 获取满意度和满意率
+     *
      * @param formDTO
      * @return
      */
-    private List<EventStatisticsResultDTO> getSatisfiedInfo(EventStatisticsFormDTO formDTO,List<EventStatisticsResultDTO> resultDTOList){
+    private List<EventStatisticsResultDTO> getSatisfiedInfo(EventStatisticsFormDTO formDTO, List<EventStatisticsResultDTO> resultDTOList) {
         List<EvaluationInfoResultDTO> resultDto = baseDao.getSatisfiedInfo(formDTO);
         // 组装满意度信息
-        for(EventStatisticsResultDTO totalDto : resultDTOList){
-            for(EvaluationInfoResultDTO childDto : resultDto){
-                if(totalDto.getDeptId().equals(childDto.getDeptId())){
+        for (EventStatisticsResultDTO totalDto : resultDTOList) {
+            for (EvaluationInfoResultDTO childDto : resultDto) {
+                if (totalDto.getDeptId().equals(childDto.getDeptId())) {
                     totalDto.setSatisfiedCount(childDto.getValue());
                     totalDto.setSatisfiedRatio(childDto.getProportion());
                     break;
@@ -267,15 +268,16 @@ public class ScreenDeptEventStatServiceImpl extends BaseServiceImpl<ScreenDeptEv
 
     /**
      * 获取按期办结信息
+     *
      * @param formDTO
      * @return
      */
-    private List<EventStatisticsResultDTO> getOnTimeDealInfo(EventStatisticsFormDTO formDTO,List<EventStatisticsResultDTO> resultDTOList){
+    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())){
+        for (EventStatisticsResultDTO totalDto : resultDTOList) {
+            for (OnTimeDealInfoResultDTO childDto : resultDto) {
+                if (totalDto.getDeptId().equals(childDto.getDeptId())) {
                     totalDto.setScheduleClosedCount(childDto.getValue());
                     totalDto.setScheduleClosedRatio(childDto.getProportion());
                     break;
@@ -287,15 +289,16 @@ public class ScreenDeptEventStatServiceImpl extends BaseServiceImpl<ScreenDeptEv
 
     /**
      * 获取红黄灯事件数
+     *
      * @param formDTO
      * @return
      */
-    private List<EventStatisticsResultDTO> getYellowRedInfo(EventStatisticsFormDTO formDTO,List<EventStatisticsResultDTO> resultDTOList){
+    private List<EventStatisticsResultDTO> getYellowRedInfo(EventStatisticsFormDTO formDTO, List<EventStatisticsResultDTO> resultDTOList) {
         List<YellowRedInfoResultDTO> resultDto = baseDao.getYellowRedInfo(formDTO);
         // 组装红黄灯事件数
-        for(EventStatisticsResultDTO totalDto : resultDTOList){
-            for(YellowRedInfoResultDTO childDto : resultDto){
-                if(totalDto.getDeptId().equals(childDto.getDeptId())){
+        for (EventStatisticsResultDTO totalDto : resultDTOList) {
+            for (YellowRedInfoResultDTO childDto : resultDto) {
+                if (totalDto.getDeptId().equals(childDto.getDeptId())) {
                     totalDto.setYellowCount(childDto.getYellowNum());
                     totalDto.setRedCount(childDto.getRedNum());
                     break;

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

@@ -451,7 +451,7 @@
             SELECT
                 a.ALL_DEPT_IDS,
                 COUNT(a.ID)                                        AS 'eventCount',
-                COUNT(a.ITEM_STATE = '10' or null) AS 'closedCount',
+                COUNT(( a.ITEM_STATE = '10' AND f.id IS NULL ) 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',
@@ -487,6 +487,14 @@
                 GROUP BY h.item_id
                 ORDER BY h.item_id
             ) e ON e.ITEM_ID = a.ID
+            LEFT JOIN (
+                SELECT id, ITEM_ID
+                FROM epdc_item_handle_process
+                WHERE DEL_FLAG = '0'
+                AND state = 1102
+                AND GRID_NEXTUNITNAME = '区中心'
+                GROUP BY ITEM_ID
+            ) f ON f.ITEM_ID = a.ID
             WHERE a.DEL_FLAG = '0'
             AND a.PEOPLE_FLAG IS NOT NULL
             AND a.IS_PEOPLE = '1'