Merge remote-tracking branch 'remotes/origin/dev_project_approval' into dev_temp

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

@@ -170,9 +170,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             log.error("公众参与排行抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
         }
 
-        ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
-        param.setCustomerId(customerId);
-        param.setDateId(dateId);
+
         //中央区 screen_user_total_data
         try {
             screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
@@ -184,7 +182,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             log.info("【难点赌点数据上报开始------】 当前客户Id{}",param.getCustomerId());
             //screenGrassrootsGovernDataAbsorptionService.difficultyDataHub(param);
 
-            //todo 初始化全量
+            ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+            param.setCustomerId(customerId);
             param.setDateId(null);
             screenGrassrootsGovernDataAbsorptionService.difficultyDataExtract(param);
             log.info("【难点赌点数据上报结束------】 当前客户Id{}",param.getCustomerId());
@@ -205,6 +204,9 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         }
         //项目分类打标签未上线，暂时屏蔽
         try{
+            ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+            param.setCustomerId(customerId);
+            param.setDateId(dateId);
             //大屏项目数据抽取_按天抽取
             screenProjectSettleService.extractScreenData(param);
         }catch (Exception e){