From f0be60fb93e662bf6b8147b9f5f9c5a9b3e0e8b9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 01 四月 2026 11:32:05 +0800
Subject: [PATCH] fix: 工序参数配置页面分页展示有误,添加分页
---
src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java | 5 +++--
src/main/java/com/ruoyi/production/service/ProductProcessParamService.java | 4 +++-
src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java | 8 ++++++--
src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java | 7 ++++---
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java
index 566261f..1df17f3 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java
@@ -1,8 +1,11 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.production.dto.ProductProcessParamDto;
import com.ruoyi.production.dto.ProductProcessParamSortDTO;
import com.ruoyi.production.pojo.ProductProcessParam;
import com.ruoyi.production.service.ProductProcessParamService;
@@ -33,8 +36,9 @@
@GetMapping("/list/{productProcessId}")
@Log(title = "鏍规嵁宸ュ簭ID鏌ヨ瀵瑰簲鐨勫弬鏁�", businessType = BusinessType.OTHER)
@ApiOperation("鏍规嵁宸ュ簭ID鏌ヨ瀵瑰簲鐨勫弬鏁�")
- public AjaxResult listByProcessId(@PathVariable("productProcessId") Long productProcessId) {
- return AjaxResult.success(productProcessParamService.listByProcessId(productProcessId));
+ public AjaxResult listByProcessId(@PathVariable("productProcessId") Long productProcessId, Page<ProductProcessParamDto> page) {
+ IPage<ProductProcessParamDto> list = productProcessParamService.listByProcessId(productProcessId, page);
+ return AjaxResult.success(list);
}
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java
index a313f7d..69f57f9 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java
@@ -1,11 +1,12 @@
package com.ruoyi.production.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.production.dto.ProductProcessParamDto;
import com.ruoyi.production.pojo.ProductProcessParam;
import org.apache.ibatis.annotations.Param;
-import java.util.List;
+
/**
* <br>
@@ -18,7 +19,7 @@
*/
public interface ProductProcessParamMapper extends BaseMapper<ProductProcessParam> {
- List<ProductProcessParamDto> selectDtoListByProcessId(@Param("processId") Long processId);
+ IPage<ProductProcessParamDto> selectDtoListByProcessId(@Param("page") IPage<ProductProcessParamDto> page, @Param("processId") Long processId);
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/service/ProductProcessParamService.java b/src/main/java/com/ruoyi/production/service/ProductProcessParamService.java
index ae2f276..7d7c802 100644
--- a/src/main/java/com/ruoyi/production/service/ProductProcessParamService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductProcessParamService.java
@@ -1,5 +1,7 @@
package com.ruoyi.production.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.dto.ProductProcessParamDto;
import com.ruoyi.production.dto.ProductProcessParamSortDTO;
@@ -18,7 +20,7 @@
*/
public interface ProductProcessParamService extends IService<ProductProcessParam> {
- List<ProductProcessParamDto> listByProcessId(Long processId);
+ IPage<ProductProcessParamDto> listByProcessId(Long processId, Page<ProductProcessParamDto> page);
void add(ProductProcessParam productProcessParam);
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java
index 7d98be6..b808ca1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.production.service.impl;
+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.ruoyi.basic.mapper.BaseParamMapper;
import com.ruoyi.basic.pojo.BaseParam;
-import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.production.dto.ProductProcessParamDto;
import com.ruoyi.production.dto.ProductProcessParamSortDTO;
import com.ruoyi.production.mapper.ProductProcessParamMapper;
@@ -34,11 +35,11 @@
BaseParamMapper baseParamMapper;
@Override
- public List<ProductProcessParamDto> listByProcessId(Long processId) {
+ public IPage<ProductProcessParamDto> listByProcessId(Long processId, Page<ProductProcessParamDto> page) {
if (processId == null) {
throw new IllegalArgumentException("宸ュ簭ID涓嶈兘涓虹┖");
}
- return baseMapper.selectDtoListByProcessId(processId);
+ return baseMapper.selectDtoListByProcessId(page, processId);
}
@Override
--
Gitblit v1.9.3