From f3eac54b5eeb921116fd308115746e8cc7fc2c3e Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 12 Oct 2020 18:20:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E6=8A=BD?= =?UTF-8?q?=E5=8F=96=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9=E5=B9=B6=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BA=8E=E5=AD=97=E6=AE=B5=E3=80=90CLOSED=5F?= =?UTF-8?q?STATUS=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/FactOriginProjectMainDailyEntity.java | 2 -- .../extract/todata/impl/ProjectExtractServiceImpl.java | 4 +--- .../src/main/resources/mapper/project/ProjectProcessDao.xml | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java index 3c7fe26b11..c570c4e453 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java @@ -133,6 +133,4 @@ public class FactOriginProjectMainDailyEntity extends BaseEpmetEntity { */ private String finishOrgIds; - private String closedStatus; - } 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 e22c8e8b75..bf892c6a84 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 @@ -87,12 +87,11 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { List closeProjects = pendingList.stream().flatMap(pending -> closedList.stream().filter(closed -> pending.getId().equals(closed.getProjectId())).map(process -> { FactOriginProjectMainDailyEntity entity = new FactOriginProjectMainDailyEntity(); - entity.setId(process.getId()); + entity.setId(process.getProjectId()); entity.setProjectStatus("close"); entity.setCreatedTime(DateUtils.stringToDate(pending.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD)); entity.setUpdatedTime(process.getUpdatedTime()); entity.setIsResolved(process.getIsResolved()); - entity.setClosedStatus(entity.getIsResolved()); return entity; })).collect(Collectors.toList()); @@ -140,7 +139,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { entity.setIssueId(project.getOriginId()); entity.setProjectStatus(project.getStatus()); entity.setIsResolved(project.getClosedStatus()); - entity.setClosedStatus(entity.getIsResolved()); entity.setCreatedTime(project.getCreatedTime()); entity.setUpdatedTime(project.getUpdatedTime()); entity.setPids(project.getOrgIdPath()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml index a1e7942543..3e0b92ed5b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml @@ -77,7 +77,7 @@