diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdContractFulfillingNoticeMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdContractFulfillingNoticeMapper.java index 1784da85..b6555c6e 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdContractFulfillingNoticeMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdContractFulfillingNoticeMapper.java @@ -1,5 +1,7 @@ package com.kms.earlyStage.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,10 +18,9 @@ import java.util.List; @Repository public interface BsSlgcQqjdContractFulfillingNoticeMapper extends BaseMapper { - List getList(@Param("proNo") String proNo, - @Param("proCode") String proCode, - @Param("contractName") String contractName, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + IPage getList(@Param("proNo") String proNo, + @Param("proCode") String proCode, + @Param("contractName") String contractName, + @Param("orderBy") String orderBy, + Page page); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdContractFulfillingNoticeService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdContractFulfillingNoticeService.java index 079677cc..a0ad5209 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdContractFulfillingNoticeService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdContractFulfillingNoticeService.java @@ -31,16 +31,13 @@ public class BsSlgcQqjdContractFulfillingNoticeService extends BaseService params = sp.getParams(); - List list = + IPage list = bsSlgcQqjdContractFulfillingNoticeMapper.getList(data.getProNo(),data.getProCode(),data.getContractName() - ,(String) params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + ,(String) params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); - Page page = new Page<>(); - page.setRecords(list); - page.setTotal(list.size()); - return page; + return list; } } diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdContractFulfillingNoticeMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdContractFulfillingNoticeMapper.xml index 3c9dcc31..823cb880 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdContractFulfillingNoticeMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdContractFulfillingNoticeMapper.xml @@ -28,7 +28,7 @@