From 2511d032f0101d7b3906b653f60d3fb6d925af66 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sun, 28 Jun 2020 16:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A2=9E=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/IssueConstant.java | 4 +- .../service/impl/StatsIssueServiceImpl.java | 47 ++++++++----------- .../resources/mapper/issue/StatsIssueDao.xml | 30 +----------- 3 files changed, 23 insertions(+), 58 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java index 338b35e1a1..c611d4b97e 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java @@ -21,9 +21,9 @@ public interface IssueConstant { /** *已解决 */ - String RESLOVED = "resloved"; + String RESOLVED = "resolved"; /** *未解决 */ - String UNRESLOVED = "unresloved"; + String UNRESOLVED = "unresolved"; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java index 3043e97e1a..11f7e915fb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java @@ -292,8 +292,8 @@ public class StatsIssueServiceImpl implements StatsIssueService { })).collect(Collectors.toList()); Map> totalMap = totalList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus)); - List resolveList = totalMap.get(IssueConstant.RESLOVED); - List unResolveList = totalMap.get(IssueConstant.UNRESLOVED); + List resolveList = totalMap.get(IssueConstant.RESOLVED); + List unResolveList = totalMap.get(IssueConstant.UNRESOLVED); if (null != resolveList) { resolveMap = resolveList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting())); } @@ -312,8 +312,8 @@ public class StatsIssueServiceImpl implements StatsIssueService { })).collect(Collectors.toList()); Map> incMap = incList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus)); - List resolveIncList = incMap.get(IssueConstant.RESLOVED); - List unResolveIncList = incMap.get(IssueConstant.UNRESLOVED); + List resolveIncList = incMap.get(IssueConstant.RESOLVED); + List unResolveIncList = incMap.get(IssueConstant.UNRESOLVED); if (null != resolveIncList) { resolveIncMap = resolveIncList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting())); } @@ -386,8 +386,8 @@ public class StatsIssueServiceImpl implements StatsIssueService { })).collect(Collectors.toList()); Map> totalMap = totalList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus)); - List resolveList = totalMap.get(IssueConstant.RESLOVED); - List unResolveList = totalMap.get(IssueConstant.UNRESLOVED); + List resolveList = totalMap.get(IssueConstant.RESOLVED); + List unResolveList = totalMap.get(IssueConstant.UNRESOLVED); if (null != resolveList) { resolveMap = resolveList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting())); } @@ -505,10 +505,10 @@ public class StatsIssueServiceImpl implements StatsIssueService { for (IssueGridDTO dto : list) { if (grid.getId().equals(dto.getGridId())) { - if (IssueConstant.RESLOVED.equals(dto.getStatus())) { + if (IssueConstant.RESOLVED.equals(dto.getStatus())) { //表决中议题数量 resolvedInc = dto.getCount(); - } else if (IssueConstant.UNRESLOVED.equals(dto.getStatus())) { + } else if (IssueConstant.UNRESOLVED.equals(dto.getStatus())) { //已转项目议题数量 unresolvedInc = dto.getCount(); } @@ -536,10 +536,10 @@ public class StatsIssueServiceImpl implements StatsIssueService { for (IssueGridDTO dto : list) { if (grid.getId().equals(dto.getGridId())) { - if (IssueConstant.RESLOVED.equals(dto.getStatus())) { + if (IssueConstant.RESOLVED.equals(dto.getStatus())) { //已解决议题数量 resolvedCount = dto.getCount(); - } else if (IssueConstant.UNRESLOVED.equals(dto.getStatus())) { + } else if (IssueConstant.UNRESOLVED.equals(dto.getStatus())) { //未解决议题数量 unresolvedCount = dto.getCount(); } @@ -586,16 +586,13 @@ public class StatsIssueServiceImpl implements StatsIssueService { } else if(IssueConstant.CLOSED.equals(dto.getStatus())) { //已关闭议题数量 closedInc = dto.getCount(); - } else { - issueInc = dto.getCount(); } } } - entity.setVotingIncr(votingInc); entity.setShiftProjectIncr(shiftInc); entity.setClosedIncr(closedInc); - entity.setIssueIncr(issueInc); + entity.setIssueIncr(votingInc); } /** @@ -665,10 +662,10 @@ public class StatsIssueServiceImpl implements StatsIssueService { for (ProjectAgencyDTO project : list) { if (agency.getId().equals(project.getAgencyId()) || project.getPIds().contains(pIds)) { - if (IssueConstant.RESLOVED.equals(project.getStatus())) { + if (IssueConstant.RESOLVED.equals(project.getStatus())) { //已解决数量 resolvedCount = resolvedCount + project.getCount(); - } else if (IssueConstant.SHIFT_PROJECT.equals(project.getStatus())) { + } else if (IssueConstant.UNRESOLVED.equals(project.getStatus())) { //未解决数量 unresolvedCount = unresolvedCount + project.getCount(); } @@ -699,10 +696,10 @@ public class StatsIssueServiceImpl implements StatsIssueService { for (ProjectAgencyDTO project : list) { if (agency.getId().equals(project.getAgencyId()) || project.getPIds().contains(pIds)) { - if (IssueConstant.RESLOVED.equals(project.getStatus())) { + if (IssueConstant.RESOLVED.equals(project.getStatus())) { //已解决数量 resolvedCount = resolvedCount + project.getCount(); - } else if (IssueConstant.SHIFT_PROJECT.equals(project.getStatus())) { + } else if (IssueConstant.UNRESOLVED.equals(project.getStatus())) { //未解决数量 unresolvedCount = unresolvedCount + project.getCount(); } @@ -752,16 +749,13 @@ public class StatsIssueServiceImpl implements StatsIssueService { } else if(IssueConstant.CLOSED.equals(issueAgency.getStatus())) { //已关闭议题数量 closedInc = closedInc + issueAgency.getCount(); - } else { - //议题增量 - issueInc = issueInc + issueAgency.getCount(); } } } entity.setVotingIncr(votingInc); entity.setShiftProjectIncr(shiftInc); entity.setClosedIncr(closedInc); - entity.setIssueIncr(issueInc); + entity.setIssueIncr(votingInc); } /** @@ -833,10 +827,10 @@ public class StatsIssueServiceImpl implements StatsIssueService { for (IssueAgencyDTO issueAgency : list) { if (agency.getId().equals(issueAgency.getAgencyId()) || issueAgency.getPIds().contains(pIds)) { - if (IssueConstant.RESLOVED.equals(issueAgency.getStatus())) { + if (IssueConstant.RESOLVED.equals(issueAgency.getStatus())) { //表决中议题数量 resolvedCount = resolvedCount + issueAgency.getCount(); - } else if (IssueConstant.UNRESLOVED.equals(issueAgency.getStatus())) { + } else if (IssueConstant.UNRESOLVED.equals(issueAgency.getStatus())) { //已转项目议题数量 unresolvedCount = unresolvedCount + issueAgency.getCount(); } @@ -872,10 +866,10 @@ public class StatsIssueServiceImpl implements StatsIssueService { for (IssueAgencyDTO issueAgency : list) { if (agency.getId().equals(issueAgency.getAgencyId()) || issueAgency.getPIds().contains(pIds)) { - if (IssueConstant.RESLOVED.equals(issueAgency.getStatus())) { + if (IssueConstant.RESOLVED.equals(issueAgency.getStatus())) { //表决中议题数量 resolvedInc = resolvedInc + issueAgency.getCount(); - } else if (IssueConstant.UNRESLOVED.equals(issueAgency.getStatus())) { + } else if (IssueConstant.UNRESOLVED.equals(issueAgency.getStatus())) { //已转项目议题数量 unresolvedInc = unresolvedInc + issueAgency.getCount(); } @@ -885,7 +879,6 @@ public class StatsIssueServiceImpl implements StatsIssueService { entity.setClosedUnresolvedIncr(unresolvedInc); } - /** * 初始化数据 * 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 23dd47e689..2f6545f289 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 @@ -37,20 +37,6 @@ GROUP BY i.ORG_ID, ip.ISSUE_STATUS - UNION - SELECT - i.ORG_ID AS "agencyId", - i.ORG_ID_PATH AS "pIds", - "all" AS "status", - COUNT( ip.ISSUE_ID ) AS "count" - FROM - issue i - INNER JOIN ( SELECT DISTINCT ISSUE_ID FROM issue_process WHERE DEL_FLAG = '0' AND DATE( CREATED_TIME ) = #{date} ) ip ON i.ID = ip.ISSUE_ID - WHERE - i.DEL_FLAG = '0' - AND i.CUSTOMER_ID = #{customerId} - GROUP BY - i.ORG_ID ) a ORDER BY agencyId @@ -125,21 +111,7 @@ GROUP BY i.ORG_ID, i.GRID_ID, - ip.ISSUE_STATUS UNION - SELECT - i.ORG_ID AS "agencyId", - i.GRID_ID AS "gridId", - "all" AS "status", - COUNT( ip.ISSUE_ID ) AS "count" - FROM - issue i - INNER JOIN ( SELECT DISTINCT ISSUE_ID FROM issue_process WHERE DEL_FLAG = '0' AND DATE( CREATED_TIME ) = #{date} ) ip ON i.ID = ip.ISSUE_ID - WHERE - i.DEL_FLAG = '0' - AND i.CUSTOMER_ID = #{customerId} - GROUP BY - i.ORG_ID, - i.GRID_ID + ip.ISSUE_STATUS ) a ORDER BY agencyId