网格自治项目数修改

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -569,10 +569,7 @@ public class DemoController {
     }
 
     @PostMapping("gridgovern")
-    public void gridGovern(){
+    public void gridGovern(@RequestParam("customerId")String customerId,@RequestParam("monthId")String monthId){
-        String customerId = "45687aa479955f9d06204d415238f7cc";
-//        String customerId = "epmettest";
-        String monthId = "202009";
         calGridIndexService.calGridIndexGovernAbility(customerId,monthId);
     }
 

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

@@ -74,6 +74,14 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
      * @date 2020/9/18 5:25 下午
      */
     List<AutoNoMyResultDTO> selectProjectAutoNoMy(@Param("customerId") String customerId,@Param("monthId") String monthId);
+    /**
+     * @Description  网格项目自治率查询 最新版
+     * @Param customerId
+     * @Param monthId
+     * @author zxc
+     * @date 2021/4/12 上午10:46
+     */
+    List<AutoNoMyResultDTO> selectProjectAutoNoMyPlus(@Param("customerId") String customerId,@Param("monthId") String monthId);
 
     /**
      * 根据日期删除数据

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

@@ -254,21 +254,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         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));
+                autoMap.put(gridId,projectList.size());
-                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()) {
-                        count.getAndSet(count.get() + NumConstant.ONE);
-                    }
-                });
-                autoMap.put(gridId,count.get());
             });
         }
         //网格办结项目数
@@ -370,17 +356,21 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                 });
             }
             // 5. 网格内解决的项目的满意度
-            resultSatisfactionScore.forEach((k, v) -> {
+            if (!CollectionUtils.isEmpty(resultSatisfactionScore)){
-                if (r.getGridId().equals(k)) {
+                resultSatisfactionScore.forEach((k, v) -> {
-                    r.setSatisfactionRatio(v);
+                    if (r.getGridId().equals(k)) {
-                }
+                        r.setSatisfactionRatio(v);
-            });
+                    }
+                });
+            }
             // 6. 网格自治项目数
-            autoMap.forEach((k, v) -> {
+            if (!CollectionUtils.isEmpty(autoMap)){
-                if (r.getGridId().equals(k)) {
+                autoMap.forEach((k, v) -> {
-                    r.setSelfSolveProjectCount(v);
+                    if (r.getGridId().equals(k)) {
-                }
+                        r.setSelfSolveProjectCount(v);
-            });
+                    }
+                });
+            }
         });
         delGovernAbility(customerId, monthId);
         List<List<GovernAbilityGridMonthlyFormDTO>> resultList = ListUtils.partition(result, NumConstant.ONE_HUNDRED);

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

@@ -156,7 +156,8 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
      */
     @Override
     public List<AutoNoMyResultDTO> selectProjectAutoNoMy(String customerId, String monthId) {
-        return baseDao.selectProjectAutoNoMy(customerId, monthId);
+//        return baseDao.selectProjectAutoNoMy(customerId, monthId);
+        return baseDao.selectProjectAutoNoMyPlus(customerId, monthId);
     }
 
     @Override

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

@@ -530,4 +530,25 @@
             AND CUSTOMER_ID = #{customerId}
             AND MONTH_ID = #{monthId}
     </select>
+
+    <!-- 网格项目自治率查询 最新版 -->
+    <select id="selectProjectAutoNoMyPlus" 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
+        WHERE l.DEL_FLAG = 0
+          AND l.CUSTOMER_ID = #{customerId}
+          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')
+          AND l.PROJECT_ID IN (SELECT ID FROM fact_origin_project_main_daily WHERE DEL_FLAG = 0 AND PROJECT_STATUS = 'closed' AND MONTH_ID = #{monthId})
+        GROUP BY PROJECT_ID
+        HAVING COUNT(DISTINCT(ORG_ID)) = 1
+    </select>
 </mapper>