From bbdaa26536663fe9d85d45c734acf3638393a7db Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 02 四月 2026 11:32:44 +0800
Subject: [PATCH] fix: 工序根据条件返回全部/启用数据
---
src/main/java/com/ruoyi/production/controller/ProductProcessController.java | 9 +++++----
src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java | 7 +++++++
src/main/java/com/ruoyi/production/service/ProductProcessService.java | 2 ++
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
index c25f2cc..702d091 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
@@ -44,7 +44,7 @@
@ApiModelProperty("鏂板宸ュ簭")
@PostMapping()
@Log(title = "鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add( @RequestBody ProductProcessDto productProcessDto) {
+ public AjaxResult add(@RequestBody ProductProcessDto productProcessDto) {
return productProcessService.add(productProcessDto);
}
@@ -64,9 +64,10 @@
@ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
@GetMapping("/list")
- public AjaxResult list() {
- return AjaxResult.success(productProcessService.list());
- }
+ public AjaxResult list(@RequestParam(required = false) Integer dateType) {
+ List<ProductProcess> productProcessList = productProcessService.productProcessList(dateType);
+ return AjaxResult.success(productProcessList);
+ }
/**
* 瀵煎叆宸ュ簭
diff --git a/src/main/java/com/ruoyi/production/service/ProductProcessService.java b/src/main/java/com/ruoyi/production/service/ProductProcessService.java
index 8b61bdd..89154e4 100644
--- a/src/main/java/com/ruoyi/production/service/ProductProcessService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductProcessService.java
@@ -25,4 +25,6 @@
AjaxResult importData(MultipartFile file);
String batchDelete(List<Integer> ids);
+
+ List<ProductProcess> productProcessList(Integer dateType);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
index 3be9086..be5443b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -89,4 +90,10 @@
productProcessMapper.deleteBatchIds(ids);
return null;
}
+
+ @Override
+ public List<ProductProcess> productProcessList(Integer dateType) {
+ return baseMapper.selectList(new LambdaQueryWrapper<ProductProcess>()
+ .eq(dateType != null, ProductProcess::getStatus, 1));
+ }
}
--
Gitblit v1.9.3