elink-star
/
epmet-cloud-zhengwu-yantai
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

议题增量统计修改

feature/evaluate
zhaoqifeng 5 years ago
parent
bf2dc8a3fe
commit
2511d032f0
3 changed files with 23 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java
  2. 47
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java
  3. 30
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

4
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IssueConstant.java
View File

@ -21,9 +21,9 @@ public interface IssueConstant {
/** /**
*已解决 *已解决
*/ */
String RESLOVED = "resloved"; String RESOLVED = "resolved";
/** /**
*未解决 *未解决
*/ */
String UNRESLOVED = "unresloved"; String UNRESOLVED = "unresolved";
} }

47
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java
View File

@ -292,8 +292,8 @@ public class StatsIssueServiceImpl implements StatsIssueService {
})).collect(Collectors.toList()); })).collect(Collectors.toList());
Map<String, List<IssueProjectDTO>> totalMap = Map<String, List<IssueProjectDTO>> totalMap =
totalList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus)); totalList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus));
List<IssueProjectDTO> resolveList = totalMap.get(IssueConstant.RESLOVED); List<IssueProjectDTO> resolveList = totalMap.get(IssueConstant.RESOLVED);
List<IssueProjectDTO> unResolveList = totalMap.get(IssueConstant.UNRESLOVED); List<IssueProjectDTO> unResolveList = totalMap.get(IssueConstant.UNRESOLVED);
if (null != resolveList) { if (null != resolveList) {
resolveMap = resolveList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting())); resolveMap = resolveList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting()));
} }
@ -312,8 +312,8 @@ public class StatsIssueServiceImpl implements StatsIssueService {
})).collect(Collectors.toList()); })).collect(Collectors.toList());
Map<String, List<IssueProjectDTO>> incMap = Map<String, List<IssueProjectDTO>> incMap =
incList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus)); incList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus));
List<IssueProjectDTO> resolveIncList = incMap.get(IssueConstant.RESLOVED); List<IssueProjectDTO> resolveIncList = incMap.get(IssueConstant.RESOLVED);
List<IssueProjectDTO> unResolveIncList = incMap.get(IssueConstant.UNRESLOVED); List<IssueProjectDTO> unResolveIncList = incMap.get(IssueConstant.UNRESOLVED);
if (null != resolveIncList) { if (null != resolveIncList) {
resolveIncMap = resolveIncList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting())); resolveIncMap = resolveIncList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting()));
} }
@ -386,8 +386,8 @@ public class StatsIssueServiceImpl implements StatsIssueService {
})).collect(Collectors.toList()); })).collect(Collectors.toList());
Map<String, List<IssueProjectDTO>> totalMap = Map<String, List<IssueProjectDTO>> totalMap =
totalList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus)); totalList.stream().collect(Collectors.groupingBy(IssueProjectDTO::getStatus));
List<IssueProjectDTO> resolveList = totalMap.get(IssueConstant.RESLOVED); List<IssueProjectDTO> resolveList = totalMap.get(IssueConstant.RESOLVED);
List<IssueProjectDTO> unResolveList = totalMap.get(IssueConstant.UNRESLOVED); List<IssueProjectDTO> unResolveList = totalMap.get(IssueConstant.UNRESOLVED);
if (null != resolveList) { if (null != resolveList) {
resolveMap = resolveList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting())); resolveMap = resolveList.stream().collect(Collectors.groupingBy(IssueProjectDTO:: getGridId, Collectors.counting()));
} }
@ -505,10 +505,10 @@ public class StatsIssueServiceImpl implements StatsIssueService {
for (IssueGridDTO dto : list) { for (IssueGridDTO dto : list) {
if (grid.getId().equals(dto.getGridId())) { if (grid.getId().equals(dto.getGridId())) {
if (IssueConstant.RESLOVED.equals(dto.getStatus())) { if (IssueConstant.RESOLVED.equals(dto.getStatus())) {
//表决中议题数量 //表决中议题数量
resolvedInc = dto.getCount(); resolvedInc = dto.getCount();
} else if (IssueConstant.UNRESLOVED.equals(dto.getStatus())) { } else if (IssueConstant.UNRESOLVED.equals(dto.getStatus())) {
//已转项目议题数量 //已转项目议题数量
unresolvedInc = dto.getCount(); unresolvedInc = dto.getCount();
} }
@ -536,10 +536,10 @@ public class StatsIssueServiceImpl implements StatsIssueService {
for (IssueGridDTO dto : list) { for (IssueGridDTO dto : list) {
if (grid.getId().equals(dto.getGridId())) { if (grid.getId().equals(dto.getGridId())) {
if (IssueConstant.RESLOVED.equals(dto.getStatus())) { if (IssueConstant.RESOLVED.equals(dto.getStatus())) {
//已解决议题数量 //已解决议题数量
resolvedCount = dto.getCount(); resolvedCount = dto.getCount();
} else if (IssueConstant.UNRESLOVED.equals(dto.getStatus())) { } else if (IssueConstant.UNRESOLVED.equals(dto.getStatus())) {
//未解决议题数量 //未解决议题数量
unresolvedCount = dto.getCount(); unresolvedCount = dto.getCount();
} }
@ -586,16 +586,13 @@ public class StatsIssueServiceImpl implements StatsIssueService {
} else if(IssueConstant.CLOSED.equals(dto.getStatus())) { } else if(IssueConstant.CLOSED.equals(dto.getStatus())) {
//已关闭议题数量 //已关闭议题数量
closedInc = dto.getCount(); closedInc = dto.getCount();
} else {
issueInc = dto.getCount();
} }
} }
} }
entity.setVotingIncr(votingInc); entity.setVotingIncr(votingInc);
entity.setShiftProjectIncr(shiftInc); entity.setShiftProjectIncr(shiftInc);
entity.setClosedIncr(closedInc); entity.setClosedIncr(closedInc);
entity.setIssueIncr(issueInc); entity.setIssueIncr(votingInc);
} }
/** /**
@ -665,10 +662,10 @@ public class StatsIssueServiceImpl implements StatsIssueService {
for (ProjectAgencyDTO project : list) { for (ProjectAgencyDTO project : list) {
if (agency.getId().equals(project.getAgencyId()) || project.getPIds().contains(pIds)) { 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(); resolvedCount = resolvedCount + project.getCount();
} else if (IssueConstant.SHIFT_PROJECT.equals(project.getStatus())) { } else if (IssueConstant.UNRESOLVED.equals(project.getStatus())) {
//未解决数量 //未解决数量
unresolvedCount = unresolvedCount + project.getCount(); unresolvedCount = unresolvedCount + project.getCount();
} }
@ -699,10 +696,10 @@ public class StatsIssueServiceImpl implements StatsIssueService {
for (ProjectAgencyDTO project : list) { for (ProjectAgencyDTO project : list) {
if (agency.getId().equals(project.getAgencyId()) || project.getPIds().contains(pIds)) { 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(); resolvedCount = resolvedCount + project.getCount();
} else if (IssueConstant.SHIFT_PROJECT.equals(project.getStatus())) { } else if (IssueConstant.UNRESOLVED.equals(project.getStatus())) {
//未解决数量 //未解决数量
unresolvedCount = unresolvedCount + project.getCount(); unresolvedCount = unresolvedCount + project.getCount();
} }
@ -752,16 +749,13 @@ public class StatsIssueServiceImpl implements StatsIssueService {
} else if(IssueConstant.CLOSED.equals(issueAgency.getStatus())) { } else if(IssueConstant.CLOSED.equals(issueAgency.getStatus())) {
//已关闭议题数量 //已关闭议题数量
closedInc = closedInc + issueAgency.getCount(); closedInc = closedInc + issueAgency.getCount();
} else {
//议题增量
issueInc = issueInc + issueAgency.getCount();
} }
} }
} }
entity.setVotingIncr(votingInc); entity.setVotingIncr(votingInc);
entity.setShiftProjectIncr(shiftInc); entity.setShiftProjectIncr(shiftInc);
entity.setClosedIncr(closedInc); entity.setClosedIncr(closedInc);
entity.setIssueIncr(issueInc); entity.setIssueIncr(votingInc);
} }
/** /**
@ -833,10 +827,10 @@ public class StatsIssueServiceImpl implements StatsIssueService {
for (IssueAgencyDTO issueAgency : list) { for (IssueAgencyDTO issueAgency : list) {
if (agency.getId().equals(issueAgency.getAgencyId()) || issueAgency.getPIds().contains(pIds)) { 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(); resolvedCount = resolvedCount + issueAgency.getCount();
} else if (IssueConstant.UNRESLOVED.equals(issueAgency.getStatus())) { } else if (IssueConstant.UNRESOLVED.equals(issueAgency.getStatus())) {
//已转项目议题数量 //已转项目议题数量
unresolvedCount = unresolvedCount + issueAgency.getCount(); unresolvedCount = unresolvedCount + issueAgency.getCount();
} }
@ -872,10 +866,10 @@ public class StatsIssueServiceImpl implements StatsIssueService {
for (IssueAgencyDTO issueAgency : list) { for (IssueAgencyDTO issueAgency : list) {
if (agency.getId().equals(issueAgency.getAgencyId()) || issueAgency.getPIds().contains(pIds)) { 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(); resolvedInc = resolvedInc + issueAgency.getCount();
} else if (IssueConstant.UNRESLOVED.equals(issueAgency.getStatus())) { } else if (IssueConstant.UNRESOLVED.equals(issueAgency.getStatus())) {
//已转项目议题数量 //已转项目议题数量
unresolvedInc = unresolvedInc + issueAgency.getCount(); unresolvedInc = unresolvedInc + issueAgency.getCount();
} }
@ -885,7 +879,6 @@ public class StatsIssueServiceImpl implements StatsIssueService {
entity.setClosedUnresolvedIncr(unresolvedInc); entity.setClosedUnresolvedIncr(unresolvedInc);
} }
/** /**
* 初始化数据 * 初始化数据
* *

30
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
View File

@ -37,20 +37,6 @@
GROUP BY GROUP BY
i.ORG_ID, i.ORG_ID,
ip.ISSUE_STATUS 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 ) a
ORDER BY ORDER BY
agencyId agencyId
@ -125,21 +111,7 @@
GROUP BY GROUP BY
i.ORG_ID, i.ORG_ID,
i.GRID_ID, i.GRID_ID,
ip.ISSUE_STATUS UNION ip.ISSUE_STATUS
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
) a ) a
ORDER BY ORDER BY
agencyId agencyId

Write Preview
Loading…
Cancel
Save