From 9c3d9f35ce18b3610d8b89257ec075abe7354f16 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 17 Feb 2022 10:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenExtractServiceImpl.java        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
index 6d4e5c029f..76764c1322 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
@@ -278,20 +278,6 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                     } catch (Exception e) {
                         log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                     }
-
-                    //按天统计：网格内各个分类下的项目总数
-                    try {
-                        screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
-                    } catch (Exception e) {
-                        log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
-                    }
-
-                    // 按天统计：组织内各个分类下的项目总数
-                    try {
-                        screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
-                    } catch (Exception e) {
-                        log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
-                    }
                 } finally {
                     latch.countDown();
                     log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
@@ -342,6 +328,20 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                         log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                     }
                     extractPartData(customerId, dateId, null);
+                    // 挪到这的原因是因为，要等 screen_project_data表跑完,下面两个方法抽取数据来源于screen_project_data和screen_project_category
+                    //按天统计：网格内各个分类下的项目总数
+                    try {
+                        screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+
+                    // 按天统计：组织内各个分类下的项目总数
+                    try {
+                        screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
+                    } catch (Exception e) {
+                        log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
                 } finally {
                     latch.countDown();
                     log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);