From d6dd4f668ea8ee5661b12aa75e377b149f8977bb Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Sep 2020 14:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8E=20?= =?UTF-8?q?=E8=BE=83=E4=B8=8A=E6=9C=88=E5=A2=9E=E9=95=BF/=E4=B8=8B?= =?UTF-8?q?=E9=99=8D=E7=8E=87=20=E8=BF=94=E5=9B=9E=E7=BB=9D=E5=AF=B9?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PublicPartiProfileResultDTO.java | 7 +++++-- .../impl/GrassRootsGovernServiceImpl.java | 21 +++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java index c5744d0cdd..8d06845555 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java @@ -33,14 +33,17 @@ public class PublicPartiProfileResultDTO implements Serializable { /** * 较上月趋势：incr上升，decr下降 - * */ + */ private String issueCompareLatestTrend = ""; /** * 平均参与度 - * */ + */ private Integer averageJoin = NumConstant.ZERO; + /** + * 较上月百分比 + */ private String joinCompareLatestMonth = ""; private String joinCompareLatestTrend = ""; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java index d750c1ee03..7afd0f4362 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java @@ -108,18 +108,17 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { UserJoinIndicatorGrowthRateResultDTO latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId); //保证获取公众参与概率数据的最大可能性 int time = NumConstant.TWELVE; - while(null == latest && time > NumConstant.ONE) - { - time --; - monthId = dateUtils.getPreviousMonthIdByDest(null,monthId); - latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId); - } + while (null == latest && time > NumConstant.ONE) { + time--; + monthId = dateUtils.getPreviousMonthIdByDest(null, monthId); + latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId); + } - if(null == latest) return new PublicPartiProfileResultDTO(); - PublicPartiProfileResultDTO result = ConvertUtils.sourceToTarget(latest,PublicPartiProfileResultDTO.class); - result.setMonthIncr(convertPercentStr(latest.getMonthIncr(),NumConstant.ZERO)); - result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth(),NumConstant.ZERO)); - result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth(),NumConstant.ZERO)); + if (null == latest) return new PublicPartiProfileResultDTO(); + PublicPartiProfileResultDTO result = ConvertUtils.sourceToTarget(latest, PublicPartiProfileResultDTO.class); + result.setMonthIncr(convertPercentStr(latest.getMonthIncr(), NumConstant.ZERO)); + result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth().abs(), NumConstant.ZERO)); + result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth().abs(), NumConstant.ZERO)); return result; }