大屏数据接口分页修改

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;

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());
         }

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<AdvanceBranchRankResultDTO> result = new LinkedList<>();