feat: 修复分页无效

guzijian
1 parent 0b1d6553
Showing 3 changed files with 23 additions and 5 deletions
ruoyi-admin/src/main/java/com/ruoyi/controller/AttendanceController.java
ruoyi-admin/src/main/java/com/ruoyi/service/AttendanceService.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
@@ -132,8 +132,7 @@ public class AttendanceController extends BaseController {
     @ApiOperation("获取一个月的排班table")
     @GetMapping("/list/people")
     public TableDataInfo getTableMonth(@ModelAttribute PeopleRequestVo vo){
-        List<TableMonthResponseVo> vos = attendanceService.getTableMonth(vo);
-        return getDataTable(vos);
+        return attendanceService.getTableMonth(vo);
     }
 package com.ruoyi.service;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.pojo.dto.SchedulingDto;
 import com.ruoyi.pojo.dto.SchedulingSettingDto;
@@ -60,7 +61,7 @@ public interface AttendanceService {
      * @param vo
      * @return
      */
-    List<TableMonthResponseVo> getTableMonth(PeopleRequestVo vo);
+    TableDataInfo getTableMonth(PeopleRequestVo vo);
     /**
      * 顶班
@@ -2,6 +2,9 @@ package com.ruoyi.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -201,12 +204,27 @@ public class AttendanceServiceImpl implements AttendanceService {
     }
     @Override
-    public List<TableMonthResponseVo> getTableMonth(PeopleRequestVo vo) {
+    public TableDataInfo getTableMonth(PeopleRequestVo vo) {
         PageUtils.startPage();
         List<RuleAttendanceMainHelp> helpList = attendanceMainService.queryPeopleList(vo);
+        long total = new PageInfo(helpList).getTotal();
         List<String> jobCodes = helpList.stream().map(RuleAttendanceMainHelp::getJobCode).collect(Collectors.toList());
         List<RuleAttendanceMain> mainList = attendanceMainService.queryNowMonthDate(vo, jobCodes);
-        return handleTableMonthResponseVo(vo.getDate(), helpList, mainList);
+        List<TableMonthResponseVo> voList = handleTableMonthResponseVo(vo.getDate(), helpList, mainList);
+        return getDataTable(voList, total);
+    }
+
+    /**
+     * 响应请求分页数据
+     */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    protected TableDataInfo getDataTable(List<?> list, Long total) {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(total);
+        return rspData;
     }
     @Override