Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

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

@@ -42,7 +42,8 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
     private IndexCollCommunityService indexCollCommunityService;
     @Autowired
     private IndexCollDistrictService indexCollDistrictService;
-
+    @Autowired
+     private IndexCollDistrictDepartmentService indexCollDistrictDepartmentService;
     /**
      * desc：从统计库对象抽取指标数据
      *
@@ -117,6 +118,15 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             } catch (Exception e) {
                 log.error("抽取【网格服务能力数据】发生异常,参数:" + JSON.toJSONString(param), e);
             }
+
+            try{
+                //dimAgency
+                long startCommunity = System.currentTimeMillis();
+                indexCollCommunityService.saveCommunityAbility(customerId, monthId);
+                log.error("社区相关-三大能力执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-startCommunity, param.getCustomerId());
+            }catch (Exception e){
+                log.error("抽取【社区治理能力-社区党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
+            }
             try{
                 //dimAgency
                 long startStreet = System.currentTimeMillis();
@@ -125,14 +135,18 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             }catch (Exception e){
                 log.error("抽取【街道治理能力-街道党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
+
+
             try{
                 //dimAgency
-                long startCommunity = System.currentTimeMillis();
-                indexCollCommunityService.saveCommunityAbility(customerId, monthId);
-                log.error("街道相关-三大能力执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-startCommunity, param.getCustomerId());
+                long startDept = System.currentTimeMillis();
+                indexCollDistrictDepartmentService.saveDepartmentAbility(customerId, monthId);
+                log.error("区直部门相关-治理能力执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-startDept, param.getCustomerId());
             }catch (Exception e){
-                log.error("抽取【社区治理能力-社区党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
+                log.error("抽取【区直部门治理能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
+
+
             try{
                 //dimAgency
                 long startDistrict = System.currentTimeMillis();