From c1db4e0ccf2c2ef1d6b6eb61946af5453010cf06 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 15:24:10 +0800
Subject: [PATCH] feat(production): 在生产和报工查询中增加车间筛选和展示
---
src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index fdf2dd3..3667bb6 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -2,6 +2,7 @@
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.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.ProductDto;
@@ -11,12 +12,10 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductService;
+import com.ruoyi.basic.vo.ProductModelVo;
import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.Arrays;
@@ -40,6 +39,12 @@
if (productDto.getProductName() != null && !productDto.getProductName().isEmpty()) {
queryWrapper.like(Product::getProductName, productDto.getProductName());
}
+ // 娴疆鐢ㄤ簬鍖哄垎鎴愬搧鍜岀墿鏂�
+ if (productDto.getProductType() != null && !productDto.getProductType().isEmpty()) {
+ if (productDto.getProductType().equals("鎴愬搧")){
+ queryWrapper.eq(Product::getProductName, productDto.getProductType());
+ }else queryWrapper.ne(Product::getProductName, "鎴愬搧");
+ }
// 鏌ヨ鏍硅妭鐐瑰垪琛�
List<Product> rootProducts = productMapper.selectList(queryWrapper);
@@ -55,7 +60,7 @@
}
@Override
- public IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel) {
+ public IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, ProductModel productModel) {
return productModelMapper.listPageProductModel(page, productModel);
}
@@ -89,6 +94,9 @@
@Override
public int addOrEditProduct(ProductDto productDto) {
+ if (ObjectUtils.isEmpty(productDto.getParentId())) {
+ throw new IllegalArgumentException("璇烽�夋嫨鐖惰妭鐐�");
+ }
if (productDto.getId() == null) {
// 鏂板浜у搧閫昏緫
if (productDto.getParentId() == null) {
--
Gitblit v1.9.3