Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

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

@@ -226,7 +226,13 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             log.error("党建引领抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
         }
 
-        //计算分数 todo 优化 手动创建线程池 控制任务数量
+        //基层治理 - 热心市民 screen_party_user_rank_data
+        ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+        param.setCustomerId(customerId);
+        param.setDateId(monthId);
+        screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
+
+        //此方法保持在最后即可   计算指标分数 todo 优化 手动创建线程池 控制任务数量
         ExecutorService pool = Executors.newSingleThreadExecutor();
         pool.submit(() -> {
             CalculateCommonFormDTO formDTO1 = new CalculateCommonFormDTO();
@@ -238,9 +244,5 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                 log.error("extractMonthly 计算分数异常，参数:{}", JSON.toJSONString(formDTO1));
             }
         });
-        //基层治理 - 热心市民 screen_party_user_rank_data
-        ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
-        param.setCustomerId(customerId);param.setDateId(monthId);
-        screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
     }
 }