From 562250741609ffacc51c95aa56fb26d3d9235e12 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 15 Jan 2026 09:50:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(crm-pdo-excoil):=20=E5=AE=9E=E7=BB=A9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E6=94=AF=E6=8C=81=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 继承BaseController以获得分页功能支持
- 修改list接口返回TableDataInfo类型支持分页数据
- 在CrmPdoExcoilForm表单中添加pageNum和pageSize字段
- 集成PageHelper实现分页逻辑
- 更新服务方法注释为支持分页查询
- 移除提前返回逻辑以确保完整查询流程执行
---
 .../controller/CrmPdoExcoilController.java      | 17 ++++++++++++++---
 .../fizz/business/form/CrmPdoExcoilForm.java    |  6 ++++++
 .../service/impl/CrmPdoExcoilServiceImpl.java   |  4 +---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
index 37ce936..dbab5c5 100644
--- a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
+++ b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
@@ -4,7 +4,9 @@ import com.fizz.business.domain.CrmPdoExcoil;
 import com.fizz.business.form.CrmPdoExcoilForm;
 import com.fizz.business.service.CrmPdoExcoilService;
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -16,7 +18,7 @@ import java.util.List;
 @RequestMapping("/api/pdo")
 @Tag(name ="实绩管理")
 @Anonymous
-public class CrmPdoExcoilController {
+public class CrmPdoExcoilController extends BaseController {
 
     @Resource
     private CrmPdoExcoilService crmPdoExcoilService;
@@ -48,7 +50,16 @@ public class CrmPdoExcoilController {
 
     @PostMapping("/list")
     @Operation(summary ="查询实绩列表")
-    public R<List<CrmPdoExcoil>> list(@RequestBody CrmPdoExcoilForm form) {
-        return R.ok(crmPdoExcoilService.listAll(form));
+    public TableDataInfo list(@RequestBody CrmPdoExcoilForm form) {
+        // 设置分页参数，默认每页20条
+        if (form.getPageNum() == null || form.getPageNum() < 1) {
+            form.setPageNum(1);
+        }
+        if (form.getPageSize() == null || form.getPageSize() < 1) {
+            form.setPageSize(20);
+        }
+        com.github.pagehelper.PageHelper.startPage(form.getPageNum(), form.getPageSize());
+        List<CrmPdoExcoil> list = crmPdoExcoilService.listAll(form);
+        return getDataTable(list);
     }
 }
diff --git a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
index bad0f62..c10371a 100644
--- a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
+++ b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
@@ -22,4 +22,10 @@ public class CrmPdoExcoilForm {
     @Schema(description = "锌层厚度")
     private BigDecimal zincCoatingThickness;
 
+    @Schema(description = "页码", example = "1")
+    private Integer pageNum = 1;
+
+    @Schema(description = "每页数量", example = "20")
+    private Integer pageSize = 20;
+
 }
diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
index 4968cbf..a591677 100644
--- a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
@@ -69,7 +69,7 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
     }
 
     /**
-     * 查询所有记录
+     * 查询所有记录（支持分页）
      *
      * @return CrmPdoExcoil对象的列表
      */
@@ -80,8 +80,6 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
         // 根据 exit_coilid 和 encoilid 进行查询
         if (!StringUtils.isEmpty(form.getCoilid())) {
             queryWrapper.like("exit_mat_id", form.getCoilid());
-
-            return baseMapper.selectList(queryWrapper);
         }
 
         if (!StringUtils.isEmpty(form.getStartDate())&& !StringUtils.isEmpty(form.getEndDate())){