From 0957b9c67fa0ffe760e08e330fcd71e283f923ea Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sat, 10 Oct 2020 11:11:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=AE=81e=E5=AE=B6-=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/GrassRootsGovernRankResultDTO.java | 6 +++--- .../dto/result/GrassRootsGovernResultDTO.java | 6 +++--- .../dto/result/GrassRootsGovernTrendDTO.java | 7 ++++--- .../GrassRootsGovernTrendResultDTO.java | 7 ++++--- .../screen/impl/AnScreenServiceImpl.java | 7 ++++--- .../ScreenAnGrassRootsGovernMonthlyDao.xml | 20 +++++++++---------- .../ScreenAnGrassRootsOrgMonthlyDao.xml | 2 +- 7 files changed, 29 insertions(+), 26 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java index a45a37c326..ac2072d44c 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java @@ -26,15 +26,15 @@ public class GrassRootsGovernRankResultDTO implements Serializable { /** * 响应度 */ - private Integer projectResponseRatio; + private String projectResponseRatio; /** * 满意度 */ - private Integer projectSatisRatio; + private String projectSatisRatio; /** * 办结率 当前界面在社区时才显示 */ - private Integer closedProjectRatio; + private String closedProjectRatio; /** * 组织名称 */ diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java index 0509d01b97..05b2e6c382 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java @@ -26,13 +26,13 @@ public class GrassRootsGovernResultDTO implements Serializable { /** * 项目响应度 */ - private Integer projectResponseRatio; + private String projectResponseRatio; /** * 项目满意率 */ - private Integer projectSatisRatio; + private String projectSatisRatio; /** * 办结率（当前界面是社区时显示） */ - private Integer closedProjectRatio; + private String closedProjectRatio; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernTrendDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernTrendDTO.java index 675a13b285..4c27d422ea 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernTrendDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernTrendDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.math.BigDecimal; /** * @author zhaoqifeng @@ -29,13 +30,13 @@ public class GrassRootsGovernTrendDTO implements Serializable { /** * 项目响应度 */ - private Integer projectResponseRatio; + private BigDecimal projectResponseRatio; /** * 项目满意率 */ - private Integer projectSatisRatio; + private BigDecimal projectSatisRatio; /** * 办结率（当前界面是社区时显示） */ - private Integer closedProjectRatio; + private BigDecimal closedProjectRatio; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernTrendResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernTrendResultDTO.java index 3fa290b21a..1a1daf5cb0 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernTrendResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernTrendResultDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** @@ -31,13 +32,13 @@ public class GrassRootsGovernTrendResultDTO implements Serializable { /** * 项目响应度 */ - private List projectResponseRatioList; + private List projectResponseRatioList; /** * 项目满意率 */ - private List projectSatisRatioList; + private List projectSatisRatioList; /** * 办结率（当前界面是社区时显示） */ - private List closedProjectRatioList; + private List closedProjectRatioList; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java index d41ae84413..0d8a064bcb 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java @@ -13,6 +13,7 @@ import com.epmet.evaluationindex.screen.dto.result.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -168,9 +169,9 @@ public class AnScreenServiceImpl implements AnScreenService { List xAxis = list.stream().map(item -> getMonth(item.getMonthId())).collect(Collectors.toList()); List partiProjectTotalList = list.stream().map(GrassRootsGovernTrendDTO::getPartiProjectTotal).collect(Collectors.toList()); List closedProjectTotalList = list.stream().map(GrassRootsGovernTrendDTO::getClosedProjectTotal).collect(Collectors.toList()); - List projectResponseRatioList = list.stream().map(GrassRootsGovernTrendDTO::getProjectResponseRatio).collect(Collectors.toList()); - List projectSatisRatioList = list.stream().map(GrassRootsGovernTrendDTO::getProjectSatisRatio).collect(Collectors.toList()); - List closedProjectRatioList = list.stream().map(GrassRootsGovernTrendDTO::getClosedProjectRatio).collect(Collectors.toList()); + List projectResponseRatioList = list.stream().map(GrassRootsGovernTrendDTO::getProjectResponseRatio).collect(Collectors.toList()); + List projectSatisRatioList = list.stream().map(GrassRootsGovernTrendDTO::getProjectSatisRatio).collect(Collectors.toList()); + List closedProjectRatioList = list.stream().map(GrassRootsGovernTrendDTO::getClosedProjectRatio).collect(Collectors.toList()); resultDTO.setXAxis(xAxis); resultDTO.setPartiProjectTotalList(partiProjectTotalList); resultDTO.setClosedProjectTotalList(closedProjectTotalList); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml index 75767069d7..99dae03ca8 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml @@ -7,9 +7,9 @@