修改全站校验和模型列表接口，新增分页

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/CheckResultMapper.java

 package com.yeejoin.amos.boot.module.tdc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
 import org.mapstruct.Mapper;
@@ -14,7 +15,7 @@ import java.util.Map;
 @Mapper
 public interface CheckResultMapper extends BaseMapper<CheckResult> {
 
-    List<CheckResultDto> selectResult(String code);
+    IPage<CheckResultDto> selectResult(IPage<CheckResultDto> page,String code);
 
     List<CheckResultDto> selectTotal(String modelId, String amosOrgCode);
 

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckModelService.java

 package com.yeejoin.amos.boot.module.tdc.api.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author xxz
  */
@@ -17,8 +16,8 @@ public interface CheckModelService extends IService<CheckModel> {
      * @param amosOrgCode 机构编码
      * @return 模型list
      */
-    List<CheckModel> selectByOrgCode(String amosOrgCode);
-
+//    List<CheckModel> selectByOrgCode(String amosOrgCode);
+    IPage<CheckModel> selectByOrgCode(int current, int size, String amosOrgCode);
 
     /**
      * 查询最后一次校验模型

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckResultService.java

 package com.yeejoin.amos.boot.module.tdc.api.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
 import com.yeejoin.amos.boot.module.tdc.api.dto.ModelTreeDto;
@@ -13,7 +14,7 @@ import java.util.List;
 public interface CheckResultService extends IService<CheckResult> {
 
 
-    List<CheckResultDto> selectResult(String code);
+    IPage<CheckResultDto> selectResult(int current,int size,String code);
 
     List<CheckResult> selectCheckResult(String modelId,String amosOrgCode);
 

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/CheckResultMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yeejoin.amos.boot.module.tdc.api.mapper.CheckResultMapper">
     <select id="selectResult" resultType="com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto">
         select check_date, case when check_type="1" then  '全站校验' else `model_name` end as `name`
-        from `tdc_check_result` where amos_org_code=#{code} GROUP BY batch_no;
+        from `tdc_check_result` where amos_org_code=#{code} GROUP BY batch_no
     </select>
 
     <select id="selectTotal" resultType="com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto">

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckModelController.java

 package com.yeejoin.amos.boot.module.tdc.biz.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckModelService;
 import io.swagger.annotations.Api;
@@ -29,10 +30,10 @@ public class CheckModelController {
      * return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @GetMapping(value = "selectByOrgCode/{amosOrgCode}")
+    @GetMapping(value = "selectByOrgCode")
     @ApiOperation(httpMethod = "GET",value = "根据amosOrgCode查询模型列表",  notes = "根据amosOrgCode查询模型列表")
-    public ResponseModel<List<CheckModel>> selectByOrgCode(@PathVariable String amosOrgCode) {
-        return ResponseHelper.buildResponse(checkModelService.selectByOrgCode(amosOrgCode));
+    public ResponseModel<IPage<CheckModel>> selectByOrgCode(int current, int size, String amosOrgCode) {
+        return ResponseHelper.buildResponse(checkModelService.selectByOrgCode(current,size,amosOrgCode));
     }
 
     /**

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckResultController.java

 package com.yeejoin.amos.boot.module.tdc.biz.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
 import com.yeejoin.amos.boot.module.tdc.api.dto.ModelTreeDto;
@@ -36,10 +37,10 @@ public class CheckResultController extends BaseController {
      * cs
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @GetMapping(value = "/selectResult/{code}")
+    @GetMapping(value = "/selectResult")
     @ApiOperation(httpMethod = "GET", value = "result", notes = "result")
-    public ResponseModel<List<CheckResultDto>> selectResult(@PathVariable(value = "code") String code) {
-        return ResponseHelper.buildResponse(checkResultService.selectResult(code));
+    public ResponseModel<IPage<CheckResultDto>> selectResult(int current,int size,String code) {
+        return ResponseHelper.buildResponse(checkResultService.selectResult(current, size, code));
     }
 
     /**

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckModelImpl.java

 package com.yeejoin.amos.boot.module.tdc.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckModelMapper;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckModelService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author xxz
  */
@@ -17,10 +16,12 @@ import java.util.List;
 public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> implements CheckModelService {
 
     @Override
-    public List<CheckModel> selectByOrgCode(String amosOrgCode) {
+    public IPage<CheckModel> selectByOrgCode(int current, int size, String amosOrgCode) {
+        Page page = new Page(current,size);
         LambdaQueryWrapper<CheckModel> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CheckModel::getAmosOrgCode, amosOrgCode);
-        return baseMapper.selectList(wrapper);
+//        return baseMapper.selectList(wrapper);
+        return this.page(page,wrapper);
     }
 
     @Override

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckResultImpl.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mysql.cj.xdevapi.JsonArray;
 import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
@@ -37,8 +39,10 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
 
 
     @Override
-    public List<CheckResultDto> selectResult(String code) {
-        return checkResultMapper.selectResult(code);
+    public IPage<CheckResultDto> selectResult(int current,int size,String code) {
+        Page page = new Page(current,size);
+
+        return checkResultMapper.selectResult(page,code);
     }
 
     @Override