zhijiezhao hace 3 años
padre
commit
304eaea6a2

+ 8 - 4
src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -23,6 +23,7 @@ import com.caimei365.user.model.vo.*;
 import com.caimei365.user.service.ClubService;
 import com.caimei365.user.utils.ImageUtils;
 import com.caimei365.user.utils.OssUtil;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -742,10 +743,9 @@ public class ClubServiceImpl implements ClubService {
 
     @Override
     public ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<VisitorRemarkVo> remarksList = clubMapper.getVisitRecordList(questionManId);
+        PageInfo<VisitorRemarkVo> remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getVisitRecordList(questionManId));
         ArrayList<VisitRemarkVo> remarkVos = new ArrayList<>();
-        remarksList.forEach(r -> {
+        remarksList.getList().forEach(r -> {
             VisitRemarkVo visit = new VisitRemarkVo();
             List<String> strings = new ArrayList<>();
             String rk = null == r.getRemarks() ? "" : r.getRemarks();
@@ -761,7 +761,11 @@ public class ClubServiceImpl implements ClubService {
             visit.setQuestionManId(r.getQuestionManId());
             remarkVos.add(visit);
         });
-        return ResponseJson.success(new PaginationVo<>(remarkVos));
+        PaginationVo<VisitRemarkVo> pageVo= new PaginationVo<>(remarkVos);
+        pageVo.setTotalPage(remarksList.getPages());
+        pageVo.setHasNextPage(remarksList.isHasNextPage());
+        pageVo.setTotalRecord((int)remarksList.getTotal());
+        return ResponseJson.success(pageVo);
     }
 
     @Override