From da30df12fc02f28a4b016c8c35a3b57e5c29fe35 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 13:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 101 +++++++++++++++++++-------------------------------
1 files changed, 38 insertions(+), 63 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index 7bf984d..49064d0 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -1,23 +1,32 @@
package com.yuanchu.limslaboratory.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
+import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
+import com.yuanchu.limslaboratory.pojo.ProductModel;
import com.yuanchu.limslaboratory.service.ProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import com.yuanchu.limslaboratory.service.UserService;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -29,71 +38,37 @@
@Resource
private ProductMapper productMapper;
- @Override
- public List<Product> selectProductByMaterialId(int materialId) {
- return productMapper.selectProductByMaterialId(materialId);
- }
+ @Resource
+ ProductModelMapper productModelMapper;
- @Autowired
- private UserService userService;
@Override
- public Integer addProductInformation(Product product) {
- return productMapper.insert(product);
- }
-
- @Override
- public List<Map<String, Object>> getListProductInformation(Integer materialId) {
- LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Product::getMaterialId, materialId);
- wrapper.select(Product::getId, Product::getName, Product::getFather);
- wrapper.groupBy(Product::getFather);
- List<Map<String, Object>> products = productMapper.selectMaps(wrapper);
- for (Map<String, Object> product:products){
- if (!ObjectUtils.isEmpty(product.get("father"))){
- product.remove("name");
- product.remove("id");
- LambdaQueryWrapper<Product> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(Product::getFather, product.get("father"));
- wrapper1.select(Product::getId, Product::getName);
- List<Map<String, Object>> maps = productMapper.selectMaps(wrapper1);
- product.put("sonProduct", maps);
- }
- }
- for (Map<String, Object> product:products){
- System.out.println(product);
- }
- return products;
- }
-
- @Override
- public Map<String, Object> getProductInformation(Integer productId) {
- Map<String, Object> productMap = productMapper.getProductInformation(productId);
- String userName = userService.selectByUserId((Integer) productMap.get("user_id"));
- productMap.remove("user_id");
- productMap.put("userName", userName);
- return productMap;
- }
-
- @Override
- public Integer deleteProductInformation(Integer productId) {
- LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Product::getId, productId);
- return productMapper.delete(wrapper);
- }
-
- @Override
- public void deleteProductEqMaterialId(List<String> materialListId) {
- for (String materialId : materialListId){
- LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Product::getMaterialId, materialId);
- wrapper.select(Product::getId);
- List<Product> products = productMapper.selectList(wrapper);
- List<Integer> productDeleteId = new ArrayList<>();
- for (Product product : products){
- productDeleteId.add(product.getId());
- }
- productMapper.deleteBatchIds(productDeleteId);
+ public void deleteProductInformation(List<Integer> SpecificationsId) {
+ for (Integer materialId : SpecificationsId) {
+ LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
+ wrapper.eq(Product::getSpecifications_id, materialId);
+ wrapper.set(Product::getState, 0);
+ productMapper.update(new Product(), wrapper);
}
}
+
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<Map<String, Object>> pageProductInformation(Integer specificationsId) {
+ return productMapper.pageProductInformation(specificationsId);
+ }
+
+ //濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
+ @Override
+ public Integer write(Integer id, String required, String internal) {
+ Product product = new Product();
+ product.setId(id);
+ product.setRequired(required);
+ product.setInternal(internal);
+ productMapper.updateById(product);
+ return 1;
+ }
+
+
}
--
Gitblit v1.9.3