From 2dbc49184bd74845c8da694c20d6fd03d7ac87e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 九月 2023 16:16:21 +0800
Subject: [PATCH] 修改   9.21

---
 standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java |   40 ++++++++++++++++++----------------------
 1 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
index 0a17c2f..77dfdb1 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -1,16 +1,14 @@
 package com.yuanchu.mom.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.mom.mapper.TechnologyMapper;
 import com.yuanchu.mom.pojo.Product;
 import com.yuanchu.mom.pojo.dto.ProductDto;
 import com.yuanchu.mom.service.ProductService;
 import com.yuanchu.mom.mapper.ProductMapper;
-import com.yuanchu.mom.utils.MyUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
+import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
@@ -49,8 +47,8 @@
 
     //鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨宸ュ簭,宸ヨ壓
     @Override
-    public List<Map<String, Object>> chooseTech(Integer specificationsId) {
-        return technologyMapper.chooseTech(specificationsId);
+    public List<Map<String, Object>> chooseTech(Integer specificationsId, Integer version) {
+        return technologyMapper.chooseTech(specificationsId, version);
     }
 
     //鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨椤圭洰鐖剁被
@@ -61,39 +59,29 @@
 
     //鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�
     @Override
-    public void addProduct(Integer technologyId, ProductDto productDto) {
+    public String addProduct(ProductDto productDto) {
         Product product = new Product();
         BeanUtils.copyProperties(productDto, product);
-        product.setTechnologyId(technologyId);
         productMapper.insert(product);
+        return "鏂板鎴愬姛!";
     }
 
     //濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
     @Override
-    public Integer write(Integer id, String required, String internal) {
+    public String write(Integer id, String required, String internal) {
         Product product = new Product();
         product.setId(id);
         product.setRequired(required);
         product.setInternal(internal);
-        return productMapper.updateById(product);
-    }
-
-    //娣诲姞鍚屼竴涓瀷鍙锋妧鏈寚鏍囩殑鐗堟湰
-    @Override
-    public Integer addVersion(Integer specificationsId,Integer version) {
-        List<Product> productList = productMapper.selAllBySpeId(specificationsId,version);
-        for (Product product : productList) {
-            product.setId(null);
-            //鏈�鏂扮増鏈�+1
-            product.setVersion(productMapper.selectVerByPro(specificationsId).get(0)+1);
-        }
-        saveBatch(productList);
-        return productList.get(0).getVersion();
+        productMapper.updateById(product);
+        return "淇濆瓨鎴愬姛!";
     }
 
     //鍒犻櫎
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delProById(Integer id) {
+        //鍒犻櫎鎶�鏈寚鏍�
         Product product = new Product();
         product.setId(id);
         product.setState(0);
@@ -102,9 +90,17 @@
 
     //鎵归噺鍒犻櫎
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delAllPro(String ids) {
+        //鎵归噺鍒犻櫎鎶�鏈寚鏍�
         productMapper.delAllPro(ids);
     }
+
+    //鏍规嵁宸ヨ壓璺嚎id鏌ヨ鎶�鏈寚鏍�
+    @Override
+    public List<Product> selProByVerSpe(Integer technologyId) {
+        return productMapper.selProByVerSpe(technologyId);
+    }
 }
 
 

--
Gitblit v1.9.3