From 3a06c8479e98678fde8f1612ab11a57faeb0bc24 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 22 四月 2026 15:39:19 +0800
Subject: [PATCH] feat(customer): 添加客户私海档案管理和类型字段
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 9382134..55c9394 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+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;
+import com.ruoyi.basic.dto.ProductModelAnticlockwiseDto;
import com.ruoyi.basic.dto.ProductModelDto;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
@@ -25,6 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.validation.constraints.NotNull;
import java.util.*;
import java.util.stream.Collectors;
@@ -70,7 +73,17 @@
public List<ProductModel> selectModelList(ProductDto productDto) {
LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProductModel::getProductId, productDto.getId());
+ queryWrapper.eq(productDto.getCreateUser() != null, ProductModel::getCreateUser, productDto.getCreateUser());
+ queryWrapper.eq(productDto.getDeptId() != null, ProductModel::getDeptId, productDto.getDeptId());
+ if (ObjectUtils.isNotEmpty(productDto.getDeptIds())) {
+ queryWrapper.in( ProductModel::getDeptId, Arrays.asList(productDto.getDeptIds()));
+ }
return productModelMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<ProductModel> selectModelListByProductIds(@NotNull List<Long> ids) {
+ return productModelMapper.selectModelListByProductIds(ids);
}
/**
@@ -151,4 +164,10 @@
throw new ServiceException("瀵煎叆澶辫触");
}
}
+
+ public Boolean checkProductModelExist(ProductModelAnticlockwiseDto productModelDto, String uuid) {
+
+
+ return true;
+ }
}
--
Gitblit v1.9.3