Commit 5574ae78d3e7b60a48e57e6c519d953188f12508
1 parent
43632d7f28
Exists in
master
and in
6 other branches
page修改
Showing 1 changed file with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
5574ae7
| ... | ... | @@ -680,13 +680,14 @@ |
| 680 | 680 | |
| 681 | 681 | @Override |
| 682 | 682 | public BaseObjectResponse couponInfo(Map<String, Object> param) { |
| 683 | + Integer currentPage = (Integer) param.get("currentPage"); | |
| 683 | 684 | PageUtil.setPageInfo(param); |
| 684 | 685 | if(param.get("hospitalId") == null) { |
| 685 | 686 | param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 根据登陆人id 查询出来的医院 */ |
| 686 | 687 | } |
| 687 | 688 | doHospitalFilter(param); |
| 688 | 689 | if(param.get("hospitalId") == null) { |
| 689 | - return RespBuilder.buildSuccess(new PageResult(0, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>()))); | |
| 690 | + return RespBuilder.buildSuccess(new PageResult(0, currentPage ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>()))); | |
| 690 | 691 | } |
| 691 | 692 | Integer type = (Integer) param.get("type"); |
| 692 | 693 | |
| ... | ... | @@ -738,7 +739,7 @@ |
| 738 | 739 | } |
| 739 | 740 | } |
| 740 | 741 | int count = couponMapper.findCouponInfoCount(param); |
| 741 | - PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle)); | |
| 742 | + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle)); | |
| 742 | 743 | return RespBuilder.buildSuccess(pageResult); |
| 743 | 744 | } if(type == 1) { /** 发放人数统计 */ |
| 744 | 745 | List<Map<String,Object>> userSendInfo = couponMapper.findUserSendInfo(param); |
| ... | ... | @@ -757,7 +758,7 @@ |
| 757 | 758 | |
| 758 | 759 | } |
| 759 | 760 | } |
| 760 | - PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo)); | |
| 761 | + PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo)); | |
| 761 | 762 | return RespBuilder.buildSuccess(pageResult); |
| 762 | 763 | } else if(type == 999) { /** 先占位置 */ |
| 763 | 764 |