From ff0b274b4551023d94fb8a96f1165145e1a5cdd1 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 25 Dec 2020 13:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=A1=B9=E7=9B=AE-=E8=8A=82=E7=82=B9-?=
 =?UTF-8?q?=E8=80=97=E6=97=B6=E6=8A=BD=E5=8F=96=E6=94=B9=E4=B8=BA=E5=85=A8?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/todata/impl/ProjectExtractServiceImpl.java   | 9 ++-------
 .../com/epmet/service/project/ProjectProcessService.java | 3 +--
 .../service/project/impl/ProjectProcessServiceImpl.java  | 9 ++-------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
index 452edc9665..63b158e72c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
@@ -389,19 +389,14 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
     /**
      * @param param
      * @return
-     * @Description 抽取项目节点历时逻辑
+     * @Description 抽取项目节点历时逻辑   全量
      * @author wangc
      * @date 2020.09.17 14:05
      **/
     @Override
     public void extractProjectPeriodData(ExtractOriginFormDTO param) {
-        int trace = factOriginProjectOrgPeriodDailyDao.selectIfExisted(param.getCustomerId());
-        Boolean isFirst = trace <= NumConstant.ZERO;
-        if (StringUtils.isBlank(param.getDateId())) {
-            param.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
-        }
         List<ProjectOrgPeriodResultDTO> extractData =
-                projectProcessService.getProjectPeriodDirectly(isFirst, param.getCustomerId(), param.getDateId());
+                projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getDateId());
         List<FactOriginProjectOrgPeriodDailyEntity> formattingData = new LinkedList<>();
 		extractData.forEach(original -> {
 			FactOriginProjectOrgPeriodDailyEntity dest
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
index 36409f2927..5a27fdca62 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
@@ -97,14 +97,13 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
 
     /**
      * @Description 直接从项目业务改造获取项目节点耗时信息
-     * @param isFirst
      * @param customerId
      * @param date
      * @return java.util.List<com.epmet.dto.project.result.ProjectOrgPeriodResultDTO>
      * @author wangc
      * @date 2020.10.23 09:10
     */
-    List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(Boolean isFirst,String customerId, String date);
+    List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String date);
 
     /**
      * 获取办结组织
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
index 09d3d2f652..d45bad78ed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
@@ -99,13 +99,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      * @date 2020.10.23 09:10
      */
     @Override
-    public List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(Boolean isFirst, String customerId, String date) {
-        if(isFirst){
-            return baseDao.selectProjectOrgPeriodDirectly(customerId,null,null);
-        }else{
-            return baseDao.selectProjectOrgPeriodDirectly(customerId,null,date);
-        }
-
+    public List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly( String customerId, String date) {
+     return baseDao.selectProjectOrgPeriodDirectly(customerId,null,null);
     }
 
     @Override