网格相关 治理能力

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/AutoNoMyResultDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.dto.extract.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/18 5:22 下午
+ */
+@Data
+public class AutoNoMyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5812052000386418907L;
+
+    /**
+     * 动作code
+     */
+    private String actionCode;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.extract.result.AutoNoMyResultDTO;
 import com.epmet.dto.extract.result.NotReturnProjectResultDTO;
 import com.epmet.dto.extract.result.ProjectEvaluateResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
@@ -63,6 +64,15 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
      */
     List<ProjectEvaluateResultDTO> selectProjectEvaluate(@Param("customerId") String customerId,@Param("monthId") String monthId);
 
+    /**
+     * @Description  网格项目自治率查询
+     * @param customerId
+     * @param monthId
+     * @author zxc
+     * @date 2020/9/18 5:25 下午
+     */
+    List<AutoNoMyResultDTO> selectProjectAutoNoMy(@Param("customerId") String customerId,@Param("monthId") String monthId);
+
     /**
      * 根据日期删除数据
      * @author zhaoqifeng

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.extract.result.AutoNoMyResultDTO;
 import com.epmet.dto.extract.result.NotReturnProjectResultDTO;
 import com.epmet.dto.extract.result.ProjectEvaluateResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
@@ -132,4 +133,13 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
      * @return void
      */
     void deleteByDate(String date);
+
+    /**
+     * @Description  网格项目自治率查询
+     * @param customerId
+     * @param monthId
+     * @author zxc
+     * @date 2020/9/18 5:25 下午
+     */
+    List<AutoNoMyResultDTO> selectProjectAutoNoMy(String customerId,String monthId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java

@@ -9,10 +9,7 @@ import com.epmet.constant.ProjectEvaluateConstant;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
 import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.GridIssueCountResultDTO;
-import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
+import com.epmet.dto.extract.result.*;
-import com.epmet.dto.extract.result.GridProjectCountResultDTO;
-import com.epmet.dto.extract.result.NotReturnProjectResultDTO;
-import com.epmet.dto.extract.result.ProjectEvaluateResultDTO;
 import com.epmet.service.evaluationindex.extract.CalGridIndexService;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService;
 import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
@@ -89,7 +86,28 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
             });
         }
         //网格自治项目数 从议题创建到项目关闭，包括处理人，自始至终没有出过议题所属网格
-
+        List<AutoNoMyResultDTO> projectAutoNoMyList = projectLogService.selectProjectAutoNoMy(customerId, monthId);
+        Map<String,Integer> autoMap = new HashMap<>(16);
+        if (!CollectionUtils.isEmpty(projectAutoNoMyList)){
+            Map<String, List<AutoNoMyResultDTO>> groupByGrid = projectAutoNoMyList.stream().collect(Collectors.groupingBy(AutoNoMyResultDTO::getGridId));
+            groupByGrid.forEach((gridId,projectList) -> {
+                Map<String, List<AutoNoMyResultDTO>> groupByProject = projectList.stream().collect(Collectors.groupingBy(AutoNoMyResultDTO::getProjectId));
+                AtomicReference<Boolean> autoSelf = new AtomicReference<>(true);
+                AtomicReference<Integer> count = new AtomicReference<>(NumConstant.ZERO);
+                groupByProject.forEach((projectId,projects) -> {
+                    String disposeGrid = projects.get(NumConstant.ZERO).getGridId();
+                    projects.forEach(p -> {
+                        if (!disposeGrid.equals(p.getGridId())){
+                            autoSelf.set(false);
+                        }
+                    });
+                    if (autoSelf.get() == true){
+                        count.getAndSet(count.get() + NumConstant.ONE);
+                    }
+                });
+                autoMap.put(gridId,count.get());
+            });
+        }
         //网格办结项目数
         List<GridProjectClosedTotalResultDTO> gridProjectClosedTotalList = projectMainService.selectGridClosedProject(customerId, monthId, ExtractConstant.CLOSED);
         //网格吹哨部门准确率  【没被退回的项目数/项目总数 】
@@ -180,6 +198,13 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                 });
             }
             // 6. 网格自治项目数
+            if (null != autoMap){
+                autoMap.forEach((k,v) -> {
+                    if (r.getGridId().equals(k)){
+                        r.setSelfSolveProjectCount(v);
+                    }
+                });
+            }
         });
         return true;
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectLogDailyDao;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.dto.extract.result.AutoNoMyResultDTO;
 import com.epmet.dto.extract.result.NotReturnProjectResultDTO;
 import com.epmet.dto.extract.result.ProjectEvaluateResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
@@ -134,4 +135,16 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         baseDao.deleteByDate(date);
     }
 
+    /**
+     * @Description  网格项目自治率查询
+     * @param customerId
+     * @param monthId
+     * @author zxc
+     * @date 2020/9/18 5:25 下午
+     */
+    @Override
+    public List<AutoNoMyResultDTO> selectProjectAutoNoMy(String customerId, String monthId) {
+        return baseDao.selectProjectAutoNoMy(customerId, monthId);
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml

@@ -60,4 +60,29 @@
             AND (ACTION_CODE = 'bad' OR ACTION_CODE = 'good' OR ACTION_CODE = 'perfect')
     </select>
 
+    <!-- 网格项目自治率查询 -->
+    <select id="selectProjectAutoNoMy" resultType="com.epmet.dto.extract.result.AutoNoMyResultDTO">
+        SELECT
+            l.ACTION_CODE,
+            l.ORG_ID AS gridId,
+            l.PROJECT_ID
+        FROM
+            fact_origin_project_log_daily l
+            LEFT JOIN fact_origin_project_main_daily m ON m.ID = l.PROJECT_ID
+        WHERE
+            l.DEL_FLAG = 0
+            AND m.DEL_FLAG = 0
+            AND m.PROJECT_STATUS = 'closed'
+            AND l.org_type = 'grid'
+            AND l.CUSTOMER_ID = #{customerId}
+            AND l.MONTH_ID = #{monthId}
+            AND (
+                l.ACTION_CODE = 'response'
+                OR l.ACTION_CODE = 'close'
+                OR l.ACTION_CODE = 'transfer'
+                OR l.ACTION_CODE = 'resolved'
+                OR l.ACTION_CODE = 'unresolved'
+                OR l.ACTION_CODE = 'created')
+    </select>
+
 </mapper>