From aac75250988c8aa90c8c1142fd7e2c115cf67672 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 30 Sep 2020 10:41:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E5=88=B0=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E8=A1=97=E9=81=93=E5=85=88=E8=BF=9B=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/OrgRankExtractServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankExtractServiceImpl.java index 3b837f9e7e..010aa9df25 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankExtractServiceImpl.java @@ -167,7 +167,7 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService { //项目数 List projectList = factOriginProjectMainDailyService.getOrgProjectCount(customerId, monthId, OrgTypeConstant.COMMUNITY); if (CollectionUtils.isNotEmpty(projectList)) { - list.forEach(entity -> projectList.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto -> + list.forEach(entity -> projectList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto -> entity.setProjectTotal(dto.getCount()) )); } @@ -234,7 +234,7 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService { //项目数 List projectList = factOriginProjectMainDailyService.getOrgProjectCount(customerId, monthId, OrgTypeConstant.STREET); if (CollectionUtils.isNotEmpty(projectList)) { - list.forEach(entity -> projectList.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto -> + list.forEach(entity -> projectList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto -> entity.setProjectTotal(dto.getCount()) )); } From 5512a67d1d70d8da7a1df8b75c91e25919885168 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 30 Sep 2020 10:46:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/issue/StatsIssueDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml index eeb0458c56..945fd7b0e3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml @@ -234,7 +234,7 @@ ip.created_time as createTime, (case when i.RESOLVE_TYPE = 'resolved' then 'closed_resolved' when i.RESOLVE_TYPE = 'unresolved' then 'closed_unresolved' - else i.ISSUE_STATUS end ) AS actionCode + else ip.ISSUE_STATUS end ) AS actionCode FROM issue_process ip LEFT JOIN issue i ON i.id = ip.issue_id