From b62b1aefb33555d8142dc9c9c3aaecca9310974b Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 3 Sep 2020 10:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/impl/GrassRootsGovernServiceImpl.java | 7 ++----- .../screen/impl/GrassrootsPartyDevServiceImpl.java | 1 + .../screen/impl/PartyMemberLeadServiceImpl.java | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) 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 bf8fe359d2..d750c1ee03 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 @@ -169,6 +169,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { while(CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE){ time--; monthId = dateUtils.getPreviousMonthIdByDest(null ,monthId); + PageHelper.startPage(NumConstant.ONE,param.getTopNum()); orderList = screenGovernRankDataDao.selectGovernCapacityRatio(monthId,param.getAgencyId()); } @@ -238,11 +239,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService { return result; } - private String convertPercentStr(BigDecimal percent){ - if(null == percent || BigDecimal.ZERO == percent) return "0.00%"; - String percentStr = percent.setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString(); - return percentStr.concat(ModuleConstant.SYMBOL_PERCENT); - } + private String convertPercentStr(BigDecimal percent,Integer digits){ if(null == percent) percent = BigDecimal.ZERO; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java index a336d356cc..619eba4625 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java @@ -207,6 +207,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService while(CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE){ time --; param.setMonthId(dateUtils.getPreviousMonthIdByDest(null,param.getMonthId())); + PageHelper.startPage(NumConstant.ONE,param.getTopNum()); orderList = screenPartyBranchDataDao.selectBranchDataByTypeOrder(param.getAgencyId(),param.getCategory(),param.getMonthId(),param.getBottomMonthId()); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java index 61fe56778d..203b5cb456 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java @@ -219,6 +219,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { while(CollectionUtils.isEmpty(gridData) && time > NumConstant.ONE){ time--; monthId = dateUtils.getPreviousMonthIdByDest(null,monthId); + PageHelper.startPage(NumConstant.ONE,param.getTopNum()); gridData = screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),monthId); } List result = new LinkedList<>();