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 | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
index cff0c60..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);
}
@@ -59,17 +59,15 @@
@DeleteMapping("/batchDelete")
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult batchDelete(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- return AjaxResult.success(productProcessService.removeBatchByIds(ids));
+ return AjaxResult.success(productProcessService.batchDelete(ids));
}
@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);
+ }
/**
* 瀵煎叆宸ュ簭
--
Gitblit v1.9.3