分页展示

zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjBalanceManageController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zhushi.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.service.ISysUserService;
@@ -46,8 +47,8 @@ public class NjBalanceManageController extends BaseController {
 
     // 查询当前用户考勤组
     @GetMapping("/query")
-    public TableDataInfo<NjBalanceManageDTO> query(NjBalanceManageDTO njBalanceManageDTO) {
-        return njBalanceManageService.queryPageList(njBalanceManageDTO);
+    public TableDataInfo<NjBalanceManageDTO> query(NjBalanceManageDTO njBalanceManageDTO, PageQuery pageQuery) {
+        return njBalanceManageService.queryPageList(njBalanceManageDTO, pageQuery);
     }
 
 

zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjRuleConfigController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zhushi.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zhushi.entity.DkCheckInRecordDTO;
@@ -28,8 +29,8 @@ public class NjRuleConfigController extends BaseController {
 
     // 查询当前用户考勤组
     @GetMapping("/queryRuleConfig")
-    public TableDataInfo<NjRuleConfigDTO> queryRule(NjRuleConfigDTO njRuleConfigDTO) {
-        return njRuleConfigService.queryRuleConfig(njRuleConfigDTO);
+    public TableDataInfo<NjRuleConfigDTO> queryRule(NjRuleConfigDTO njRuleConfigDTO, PageQuery pageQuery) {
+        return njRuleConfigService.queryRuleConfig(njRuleConfigDTO, pageQuery);
     }
 
     // 新增规则

zs-manager/src/main/java/com/ruoyi/zhushi/service/NjBalanceManageService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.zhushi.service;
 
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zhushi.entity.NjBalanceManage;
 import com.ruoyi.zhushi.entity.NjBalanceManageDTO;
@@ -8,7 +9,7 @@ import java.util.List;
 
 public interface NjBalanceManageService {
 
-    TableDataInfo<NjBalanceManageDTO> queryPageList(NjBalanceManageDTO njBalanceManageDTO);
+    TableDataInfo<NjBalanceManageDTO> queryPageList(NjBalanceManageDTO njBalanceManageDTO, PageQuery pageQuery);
 
     void insertBatch(List<NjBalanceManage> njBalanceManages);
 }

zs-manager/src/main/java/com/ruoyi/zhushi/service/NjRuleConfigService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.zhushi.service;
 
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zhushi.entity.NjRuleConfigAndUser;
 import com.ruoyi.zhushi.entity.NjRuleConfigAndUserDTO;
@@ -9,7 +10,7 @@ import java.util.List;
 
 public interface NjRuleConfigService {
 
-    TableDataInfo<NjRuleConfigDTO> queryRuleConfig(NjRuleConfigDTO njRuleConfigDTO);
+    TableDataInfo<NjRuleConfigDTO> queryRuleConfig(NjRuleConfigDTO njRuleConfigDTO, PageQuery pageQuery);
 
     public Boolean addRule(NjRuleConfigDTO njRuleConfigDTO);
 

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/NjBalanceManageServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.zhushi.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zhushi.entity.NjBalanceManage;
 import com.ruoyi.zhushi.entity.NjBalanceManageDTO;
@@ -18,11 +20,11 @@ public class NjBalanceManageServiceImpl implements NjBalanceManageService {
     private NjBalanceManageMapper njBalanceManageMapper;
 
     @Override
-    public TableDataInfo<NjBalanceManageDTO> queryPageList(NjBalanceManageDTO njBalanceManageDTO) {
+    public TableDataInfo<NjBalanceManageDTO> queryPageList(NjBalanceManageDTO njBalanceManageDTO, PageQuery pageQuery) {
         LambdaQueryWrapper<NjBalanceManage> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(njBalanceManageDTO.getUserName()!= null, NjBalanceManage::getUserName, njBalanceManageDTO.getUserName());
         queryWrapper.eq(njBalanceManageDTO.getNickName()!= null, NjBalanceManage::getNickName, njBalanceManageDTO.getNickName());
-        List<NjBalanceManageDTO> njBalanceManageDTOS = njBalanceManageMapper.selectVoList(queryWrapper, NjBalanceManageDTO.class);
+        IPage<NjBalanceManageDTO> njBalanceManageDTOS = njBalanceManageMapper.selectVoPage(pageQuery.build(), queryWrapper, NjBalanceManageDTO.class);
         return TableDataInfo.build(njBalanceManageDTOS);
     }
 

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/NjRuleConfigServiceImpl.java

@@ -2,8 +2,10 @@ package com.ruoyi.zhushi.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.Translation;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zhushi.entity.*;
 import com.ruoyi.zhushi.mapper.NjRuleConfigAndUserMapper;
@@ -25,11 +27,12 @@ public class NjRuleConfigServiceImpl implements NjRuleConfigService {
     private NjRuleConfigAndUserMapper njRuleConfigAndUserMapper;
 
     @Override
-    public TableDataInfo<NjRuleConfigDTO> queryRuleConfig(NjRuleConfigDTO njRuleConfigDTO) {
+    public TableDataInfo<NjRuleConfigDTO> queryRuleConfig(NjRuleConfigDTO njRuleConfigDTO, PageQuery pageQuery) {
 
         LambdaQueryWrapper<NjRuleConfig> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(null != njRuleConfigDTO.getRuleName(), NjRuleConfig::getRuleName, njRuleConfigDTO.getRuleName());
-        List<NjRuleConfigDTO> njRuleConfigDTOS = njRuleConfigMapper.selectVoList(queryWrapper, NjRuleConfigDTO.class);
+        IPage<NjRuleConfigDTO> njRuleConfigDTOIPage = njRuleConfigMapper.selectVoPage(pageQuery.build(), queryWrapper, NjRuleConfigDTO.class);
+        List<NjRuleConfigDTO> njRuleConfigDTOS = njRuleConfigDTOIPage.getRecords();
         njRuleConfigDTOS.forEach(nj -> {
             if(!nj.getApplicableRange()){
                 List<DkUsers> users = new ArrayList<>();