From b28fd0fbbb89cb57265a2444dc2dbcd26c4e8140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 22 Jul 2024 20:43:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shipinquan/content/app/AppShipinquanController.java  | 5 +----
 .../com/sqx/modules/shipinquan/dao/BlShipinquanDao.java  | 6 +++++-
 .../modules/shipinquan/service/BlShipinquanService.java  | 3 ++-
 .../shipinquan/service/impl/BlShipinquanServiceImpl.java | 9 ++++++++-
 src/main/resources/mapper/shipinquan/ShipinquanDao.xml   | 5 +++++
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
index 8495f50..3cbfb80 100644
--- a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
+++ b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
@@ -34,14 +34,11 @@ public class AppShipinquanController {
     @GetMapping("/list")
     @ApiOperation("获取视频数据列表")
     public Result list(BlShipinquan entity, Integer page, Integer limit){
-        QueryWrapper<BlShipinquan> qw = new QueryWrapper<>();
-        qw.orderByDesc("create_time");
         if(page==null){
             page=1;
             limit=10;
         }
-        IPage<BlShipinquan> pageList = service.page(new Page<>(page,limit),qw);
-        return Result.success().put("data",pageList);
+        return service.findPage(page,limit,entity);
     }
 
     @PostMapping("/add")
diff --git a/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanDao.java b/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanDao.java
index f141f3b..1bf7b3f 100644
--- a/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanDao.java
+++ b/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanDao.java
@@ -1,10 +1,14 @@
 package com.sqx.modules.shipinquan.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sqx.modules.bl.order.entity.UserPackage;
 import com.sqx.modules.shipinquan.entity.BlShipinquan;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface BlShipinquanDao extends BaseMapper<BlShipinquan> {
-
+    IPage<BlShipinquan> findPage(Page<BlShipinquan> page, @Param("params") BlShipinquan entity);
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/shipinquan/service/BlShipinquanService.java b/src/main/java/com/sqx/modules/shipinquan/service/BlShipinquanService.java
index 0b39ee6..d66e38d 100644
--- a/src/main/java/com/sqx/modules/shipinquan/service/BlShipinquanService.java
+++ b/src/main/java/com/sqx/modules/shipinquan/service/BlShipinquanService.java
@@ -1,8 +1,9 @@
 package com.sqx.modules.shipinquan.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
 import com.sqx.modules.shipinquan.entity.BlShipinquan;
 
 public interface BlShipinquanService extends IService<BlShipinquan> {
-
+    Result findPage(Integer page, Integer limit, BlShipinquan entity);
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/shipinquan/service/impl/BlShipinquanServiceImpl.java b/src/main/java/com/sqx/modules/shipinquan/service/impl/BlShipinquanServiceImpl.java
index 039a228..eefb06b 100644
--- a/src/main/java/com/sqx/modules/shipinquan/service/impl/BlShipinquanServiceImpl.java
+++ b/src/main/java/com/sqx/modules/shipinquan/service/impl/BlShipinquanServiceImpl.java
@@ -1,6 +1,9 @@
 package com.sqx.modules.shipinquan.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Result;
 import com.sqx.modules.shipinquan.dao.BlShipinquanDao;
 import com.sqx.modules.shipinquan.entity.BlShipinquan;
 import com.sqx.modules.shipinquan.service.BlShipinquanService;
@@ -8,5 +11,9 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class BlShipinquanServiceImpl extends ServiceImpl<BlShipinquanDao, BlShipinquan> implements BlShipinquanService {
-
+    @Override
+    public Result findPage(Integer page, Integer limit, BlShipinquan entity){
+        Page<BlShipinquan> pages=new Page<>(page,limit);
+        return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,entity)));
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
index d5aa118..2529cab 100644
--- a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
+++ b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
@@ -20,5 +20,10 @@
         </where>
     </select>
 
+    <select id="findPage" resultType="com.sqx.modules.shipinquan.entity.BlShipinquan">
+        select *
+        from bl_shipinquan
+        order by create_time desc
+    </select>
 
 </mapper>
\ No newline at end of file