获取项目节点耗时信息SQL改造

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java

@@ -128,7 +128,7 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      * @author wangc
      * @date 2020.10.23 11:13
      */
-    List<ProjectOrgPeriodResultDTO> selectProjectOrgPeriodDirectly(@Param("customerId") String customerId, @Param("projectId") String projectId);
+    List<ProjectOrgPeriodResultDTO> selectProjectOrgPeriodDirectly(@Param("customerId") String customerId, @Param("datetId")String datetId,  @Param("projectId") String projectId);
 
     /**
      * @param projects

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

@@ -452,7 +452,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
     @Override
     public void extractProjectPeriodData(ExtractOriginFormDTO param) {
         List<ProjectOrgPeriodResultDTO> extractData =
-                projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getObjectId());
+                projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getDateId(), param.getObjectId());
         List<FactOriginProjectOrgPeriodDailyEntity> formattingData = new LinkedList<>();
 		extractData.forEach(original -> {
 			FactOriginProjectOrgPeriodDailyEntity dest

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java

@@ -112,7 +112,7 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @author wangc
      * @date 2020.10.23 09:10
     */
-    List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String projectId);
+    List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String datetId, String projectId);
 
     /**
      * 获取办结组织

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java

@@ -101,15 +101,15 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      * @Description 直接从项目业务改造获取项目节点耗时信息
      * @param
      * @param customerId
-     * @param date
+     * @param datetId
      * @param projectId
      * @return java.util.List<com.epmet.dto.project.result.ProjectOrgPeriodResultDTO>
      * @author wangc
      * @date 2020.10.23 09:10
      */
     @Override
-    public List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String projectId) {
-     return baseDao.selectProjectOrgPeriodDirectly(customerId, projectId);
+    public List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String datetId, String projectId) {
+     return baseDao.selectProjectOrgPeriodDirectly(customerId, datetId, projectId);
     }
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -177,7 +177,7 @@
 
         FROM PROJECT_STAFF staff
         INNER JOIN PROJECT_ORG_RELATION relation ON staff.ID = relation.PROJECT_STAFF_ID AND relation.DEL_FLAG = '0'
-
+        AND (DATE_FORMAT(FIRST_DEALT_DATE,"%Y%m%d") >= #{datetId} OR DATE_FORMAT(HANDLED_DATE,"%Y%m%d") >= #{datetId} OR DATE_FORMAT(INFORMED_DATE,"%Y%m%d") >= #{datetId})
         WHERE staff.DEL_FLAG = '0'
         <if test="projectId != null and projectId != ''">
             AND staff.PROJECT_ID = #{projectId}