添加分页

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

 package com.hungraim.ltc.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
 import com.hungraim.ltc.pojo.vo.disable.DisableInfoVO;
@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -147,13 +148,15 @@ public class DisableController {
      * @return 失能人员信息列表
      */
     @RequestMapping("/disableList")
-    public Result<IPage<DisableVO>> disableList(String organId, String districtProvincial,
+    public Result<Page<DisableVO>> disableList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
+                                               String organId, String districtProvincial,
                                                String districtCity, String districtArea,
                                                String realName, String certiCode, String dataFrom,
-                                                String srvOrganName, int pageNum, int pageSize) {
-        IPage<DisableVO> iPage = disableService.disableList(organId, districtProvincial,
-                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, pageNum, pageSize);
-        return Result.success(iPage);
+                                               String srvOrganName) {
+        Page<DisableVO> page = new Page<>(pageNum, pageSize);
+        page = disableService.disableList(page, organId, districtProvincial,
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName);
+        return Result.success(page);
     }
 
     /**

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -19,9 +19,9 @@ import java.util.List;
 public interface DisableService {
 
 
-    Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
+    Page<DisableVO> disableList(Page<DisableVO> page, String organId, String districtProvincial, String districtCity,
                                 String districtArea, String realName, String certiCode, String dataFrom,
-                                String srvOrganName, int pageNum, int pageSize);
+                                String srvOrganName);
 
     /**
      * 失能审核信息详情

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -81,15 +81,15 @@ public class DisableServiceImpl implements DisableService {
      * @return list
      */
     @Override
-    public Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
+    public Page<DisableVO> disableList(Page<DisableVO> page, String organId, String districtProvincial, String districtCity,
                                        String districtArea, String realName, String certiCode, String dataFrom,
-                                       String srvOrganName, int pageNum, int pageSize) {
+                                       String srvOrganName) {
         // 没有organId参数的时候，这个集合就为null
         List<String> organIds = null;
         if (StrUtil.isNotBlank(organId)) {
             organIds = Arrays.asList(organId.split(","));
         }
-        return disableApplyMapper.disableList(new Page<>(pageNum, pageSize), organIds, districtProvincial,
+        return disableApplyMapper.disableList(page, organIds, districtProvincial,
                 districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName);
     }
 

governance/src/main/java/com/hungraim/ltc/governance/controller/DisableAssessmentCriteriaController.java

@@ -3,6 +3,7 @@ package com.hungraim.ltc.governance.controller;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.service.DisableAssessmentCriteriaService;
 import com.hungraim.ltc.pojo.vo.governance.CfgAprVO;
 import com.hungraim.ltc.util.Result;
@@ -10,10 +11,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * 失能评定标准Controller
  *
@@ -118,9 +118,11 @@ public class DisableAssessmentCriteriaController {
      * @param status   状态
      */
     @RequestMapping("/getDisableAssessmentCriteriaList")
-    public Result<List<CfgAprVO>> getDisableAssessmentCriteriaList(String organIds, String aprName, String status) {
-        List<CfgAprVO> list = disableAssessmentCriteriaService.getDisableAssessmentCriteriaList(organIds, aprName, status);
-        return Result.success(list);
+    public Result<Page<CfgAprVO>> getDisableAssessmentCriteriaList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
+                                                                   String organIds, String aprName, String status) {
+        Page<CfgAprVO> page = new Page<>(pageNum, pageSize);
+        page = disableAssessmentCriteriaService.getDisableAssessmentCriteriaList(page, organIds, aprName, status);
+        return Result.success(page);
     }
 
     /**

governance/src/main/java/com/hungraim/ltc/governance/controller/SrvTaskController.java

@@ -45,12 +45,6 @@ public class SrvTaskController {
         if (StringUtils.isBlank(organId)) {
             return Result.failed("参数异常!");
         }
-        if (pageNum == null) {
-            pageNum = 1;
-        }
-        if (pageSize == null) {
-            pageSize = 10;
-        }
         Page<OrganEmpVO> page = new Page<>(pageNum, pageSize);
         page = srvTaskService.getSrvOrganEmpList(page, organId, name, certiType, certifNum);
         return Result.success(page);
@@ -70,11 +64,13 @@ public class SrvTaskController {
      * @param modeId      服务方式
      */
     @RequestMapping("/getSrvTaskList")
-    public Result<List<SrvTaskVO>> getSrvTaskList(Integer organId, String disableName, String disableTel,
+    public Result<Page<SrvTaskVO>> getSrvTaskList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
+                                                  Integer organId, String disableName, String disableTel,
                                                   String empName, String certifNum, String startTime, String endTime,
                                                   String status, String modeId) {
-        List<SrvTaskVO> tasks = srvTaskService.getSrvTaskList(organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
-        return Result.success(tasks);
+        Page<SrvTaskVO> page = new Page<>(pageNum, pageSize);
+        page = srvTaskService.getSrvTaskList(page, organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
+        return Result.success(page);
     }
 
     /**

governance/src/main/java/com/hungraim/ltc/governance/dao/ChCfgAprMapper.java

 package com.hungraim.ltc.governance.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.assessment.ChCfgApr;
 import com.hungraim.ltc.pojo.vo.governance.CfgAprVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,5 +12,5 @@ import java.util.List;
 @Mapper
 @Repository
 public interface ChCfgAprMapper extends BaseMapper<ChCfgApr> {
-    List<CfgAprVO> getDisableAssessmentCriteriaList(List<String> organIds, String aprName, String status);
+    Page<CfgAprVO> getDisableAssessmentCriteriaList(Page<CfgAprVO> page, List<String> organIds, String aprName, String status);
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/SrvTaskMapper.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Repository
 public interface SrvTaskMapper extends BaseMapper<ChSrvTask> {
 
-    List<SrvTaskVO> getSrvTaskList(Integer organId, String disableName, String disableTel,
+    Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, Integer organId, String disableName, String disableTel,
                                    String empName, String certifNum, String startTime, String endTime,
                                    String status, String modeId);
 

governance/src/main/java/com/hungraim/ltc/governance/service/DisableAssessmentCriteriaService.java

 package com.hungraim.ltc.governance.service;
 
 import cn.hutool.json.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.vo.governance.CfgAprVO;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * 失能评定标准service
  *
@@ -15,7 +14,7 @@ import java.util.List;
 public interface DisableAssessmentCriteriaService {
     void addOrUpdateDisableAssessmentCriteria(Long aprId, String organId, String estimateName, String remark, Integer status, JSONArray project);
 
-    List<CfgAprVO> getDisableAssessmentCriteriaList(String organIds, String aprName, String status);
+    Page<CfgAprVO> getDisableAssessmentCriteriaList(Page<CfgAprVO> page, String organIds, String aprName, String status);
 
     void stopDisableAssessmentCriteria(String aprId);
 }

governance/src/main/java/com/hungraim/ltc/governance/service/SrvTaskService.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 @Service
 public interface SrvTaskService {
-    List<SrvTaskVO> getSrvTaskList(Integer organId, String disableName, String disableTel,
+    Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, Integer organId, String disableName, String disableTel,
                                    String empName, String certifNum, String startTime, String endTime,
                                    String status, String modeId);
 

governance/src/main/java/com/hungraim/ltc/governance/service/impl/DisableAssessmentCriteriaServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.dao.ChCfgAprItemClauseMapper;
 import com.hungraim.ltc.governance.dao.ChCfgAprItemMapper;
 import com.hungraim.ltc.governance.dao.ChCfgAprMapper;
@@ -200,12 +201,12 @@ public class DisableAssessmentCriteriaServiceImpl implements DisableAssessmentCr
     }
 
     @Override
-    public List<CfgAprVO> getDisableAssessmentCriteriaList(String organIds, String aprName, String status) {
+    public Page<CfgAprVO> getDisableAssessmentCriteriaList(Page<CfgAprVO> page, String organIds, String aprName, String status) {
         List<String> organIdList = null;
         if (StrUtil.isNotBlank(organIds)) {
             organIdList = Arrays.asList(organIds.split(","));
         }
-        return chCfgAprMapper.getDisableAssessmentCriteriaList(organIdList, aprName, status);
+        return chCfgAprMapper.getDisableAssessmentCriteriaList(page, organIdList, aprName, status);
     }
 
     @Override

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

@@ -42,10 +42,10 @@ public class SrvTaskServiceImpl implements SrvTaskService {
      * @param modeId      服务方式
      */
     @Override
-    public List<SrvTaskVO> getSrvTaskList(Integer organId, String disableName, String disableTel,
+    public Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, Integer organId, String disableName, String disableTel,
                                           String empName, String certifNum, String startTime, String endTime,
                                           String status, String modeId) {
-        return srvTaskMapper.getSrvTaskList(organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
+        return srvTaskMapper.getSrvTaskList(page, organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
     }
 
     /**