From 24d592b9c3b19bea973b5f45dbea0113c4519043 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Wed, 13 Mar 2024 09:56:11 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BsSlgcQqjdContractFulfillingNoticeMapper.java   | 13 +++++++------
 .../BsSlgcQqjdContractFulfillingNoticeService.java  |  9 +++------
 .../BsSlgcQqjdContractFulfillingNoticeMapper.xml    |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

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<BsSlgcQqjdContractFulfillingNotice> {
 
-    List<BsSlgcQqjdContractFulfillingNotice> 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<BsSlgcQqjdContractFulfillingNotice> 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<BsSlg
 
         Map<String, Object> params = sp.getParams();
 
-        List<BsSlgcQqjdContractFulfillingNotice> list =
+        IPage<BsSlgcQqjdContractFulfillingNotice> 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<BsSlgcQqjdContractFulfillingNotice> 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 @@
 
 
     <select id="getList" resultMap="BsSlgcQqjdContractFulfillingNotice">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+
         <include refid="info"/>
         <where>
             <if test="proNo!=null and proNo!=''">
@@ -41,7 +41,7 @@
                 and bn.pro_code like concat('%',#{proCode},'%')
             </if>
         </where>
-        order by bn.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+        order by bn.${orderBy} desc
     </select>