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/service/impl/ProductProcessServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
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 71e41ce..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;
@@ -62,11 +63,19 @@
if(CollectionUtils.isEmpty(productProcessList)){
return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
+ productProcessList.forEach(productProcess -> {
+ if (ObjectUtils.isEmpty(productProcess)) {
+ throw new RuntimeException("浣跨敤妯℃澘杩涜瀵煎叆");
+ }
+ if (ObjectUtils.isEmpty(productProcess.getName())) {
+ throw new RuntimeException("宸ュ簭鍚嶇О涓嶈兘涓虹┖");
+ }
+ });
this.saveOrUpdateBatch(productProcessList);
return AjaxResult.success(true);
}catch (Exception e){
e.printStackTrace();
- return AjaxResult.error("瀵煎叆澶辫触");
+ return AjaxResult.error(e.getMessage());
}
}
@@ -81,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