代码微调

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

@@ -198,7 +198,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                 try {
                     projectExtractService.extractProjectPeriodData(paramNew);
                 } catch (Exception e) {
-                    log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
+                    log.error("抽取【项目耗时数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                 }
             } else {
                 try {

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

@@ -30,7 +30,6 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectLogDailyDao;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectOrgPeriodDailyDao;
 import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
 import com.epmet.dto.extract.result.*;
-import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
 import org.apache.commons.lang3.StringUtils;
@@ -236,6 +235,7 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
         //1.评价周期内结案了的项目
         List<ProjectParticipatedAgencyResultDTO> projectsHandledByAgency = baseDao.selectProjectIdHandledByAgency(customerId, dimId);
         Map<String, BigDecimal> efficiencyMap = new HashMap<>();
+        List<String> projects = new LinkedList<>();
         if (!CollectionUtils.isEmpty(projectsHandledByAgency)) {
             Map<String, List<String>> agencyProjectsMap = new HashMap<>();
 
@@ -249,10 +249,9 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
                 }else{
                     agencyProjectsMap.get(agencyId).add(projectId);
                 }
+                projects.add(projectId);
             });
 
-            List<String> projects = new LinkedList<>();
-            agencyProjectsMap.forEach((key,value) -> {projects.addAll(value);});
             //2.结案项目的总耗时
             List<ProjectParticipatedAgencyResultDTO> costTimes = baseDao.selectProjectCostTime(projects);
 

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

@@ -104,6 +104,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 				closeProjects.forEach(close -> finishOrgList.stream().filter(finish -> close.getId().equals(finish.getProjectId())).forEach(dto -> {
 					String[] orgIds = dto.getPIdPath().split(StrConstant.COLON);
 					String org = "";
+					//取最短的ordIds中最后一个 则为最高级的那个orgIds
 					if (orgIds.length > NumConstant.ONE) {
 						org = orgIds[orgIds.length - 1];
 					} else {