screenProjectData

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

@@ -50,7 +50,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**

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

@@ -23,7 +23,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;

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

@@ -21,9 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectGridDTO;
-import com.epmet.dto.project.ProjectInfoDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
-import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO;
 import com.epmet.entity.project.ProjectEntity;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -20,19 +20,15 @@ package com.epmet.service.project.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.project.ProjectProcessDao;
 import com.epmet.dto.ProjectProcessDTO;
-import com.epmet.dto.form.CommonStaffIdFormDTO;
 import com.epmet.dto.project.FinishOrgDTO;
 import com.epmet.dto.project.ProcessInfoDTO;
-import com.epmet.dto.project.ProjectOrgRelationDTO;
 import com.epmet.dto.project.ProjectStaffDTO;
 import com.epmet.dto.project.result.ProjectLatestOperationResultDTO;
 import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
-import com.epmet.dto.project.result.ProjectOrgRelationWhenResponseResultDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO;
 import com.epmet.dto.screen.ScreenProjectProcessDTO;
@@ -44,9 +40,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
@@ -98,7 +92,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
 
     /**
      * @Description 直接从项目业务改造获取项目节点耗时信息
-     * @param isFirst
+     * @param
      * @param customerId
      * @param date
      * @return java.util.List<com.epmet.dto.project.result.ProjectOrgPeriodResultDTO>
@@ -191,8 +185,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     public List<ScreenProjectProcessDTO> buildNewScreenProjectProcessData(String customerId, String dateId, boolean ifRanged) {
         List<ScreenProjectProcessDTO> processes = baseDao.selectProjectProcessAndDirection(customerId, ifRanged ? null : dateId, dateId);
         if(CollectionUtils.isEmpty(processes)) return null;
-        return processes.stream().filter(process -> StringUtils.equalsAny(process.getOperation(),
+        return processes.stream().map(target -> {
-                "close","return","transfer")).map(target -> {
             List<ProjectStaffDTO> points = target.getPoints();
             if(!CollectionUtils.isEmpty(points)){
                 List<String> orgIds = points.stream().map(ProjectStaffDTO::getOrgId).distinct().collect(Collectors.toList());

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

@@ -27,7 +27,6 @@ import com.epmet.dto.project.ProjectAgencyDTO;
 import com.epmet.dto.project.ProjectCategoryDTO;
 import com.epmet.dto.project.ProjectGridDTO;
 import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
-import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO;
 import com.epmet.entity.project.ProjectEntity;
 import com.epmet.service.project.ProjectService;
 import org.apache.commons.lang3.StringUtils;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/TopicService.java

@@ -10,7 +10,6 @@ import com.epmet.dto.stats.topic.result.TopicStatisticalData;
 import com.epmet.dto.topic.ResiTopicDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyImgDataEntity;
-import com.epmet.entity.evaluationindex.screen.ScreenProjectImgDataEntity;
 import com.epmet.util.DimIdGenerator;
 
 import java.util.Date;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java

@@ -6,7 +6,6 @@ import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.user.result.UserStatisticalData;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
 import com.epmet.util.DimIdGenerator;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;