|
@@ -443,9 +443,9 @@ public class ClubServiceImpl implements ClubService {
|
|
if (null == serviceProviderId) {
|
|
if (null == serviceProviderId) {
|
|
return ResponseJson.error("参数异常,协销id不能为空", null);
|
|
return ResponseJson.error("参数异常,协销id不能为空", null);
|
|
}
|
|
}
|
|
- List<RemarksVo> remarksList = clubMapper.getRemarksList(serviceProviderId);
|
|
|
|
|
|
+ PageInfo<RemarksVo> PageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksList(serviceProviderId));
|
|
ArrayList<RemarkVo> remarkVos = new ArrayList<>();
|
|
ArrayList<RemarkVo> remarkVos = new ArrayList<>();
|
|
- remarksList.forEach(r -> {
|
|
|
|
|
|
+ PageInfo.getList().forEach(r -> {
|
|
RemarkVo remarkVo = new RemarkVo();
|
|
RemarkVo remarkVo = new RemarkVo();
|
|
List<String> strings = new ArrayList<>();
|
|
List<String> strings = new ArrayList<>();
|
|
String rk = null == r.getRemarks() ? "" : r.getRemarks();
|
|
String rk = null == r.getRemarks() ? "" : r.getRemarks();
|
|
@@ -462,10 +462,11 @@ public class ClubServiceImpl implements ClubService {
|
|
remarkVo.setClubName(clubMapper.findClubName(r.getClubId()));
|
|
remarkVo.setClubName(clubMapper.findClubName(r.getClubId()));
|
|
remarkVos.add(remarkVo);
|
|
remarkVos.add(remarkVo);
|
|
});
|
|
});
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
|
- PaginationVo<RemarkVo> page = new PaginationVo<>();
|
|
|
|
- page.setResults(remarkVos);
|
|
|
|
- return ResponseJson.success(page);
|
|
|
|
|
|
+ PaginationVo<RemarkVo> pageVo= new PaginationVo<>(remarkVos);
|
|
|
|
+ pageVo.setTotalPage(PageInfo.getPages());
|
|
|
|
+ pageVo.setHasNextPage(PageInfo.isHasNextPage());
|
|
|
|
+ pageVo.setTotalRecord((int)PageInfo.getTotal());
|
|
|
|
+ return ResponseJson.success(pageVo);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|