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 | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 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 8f60368..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,6 +1,5 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.TechnologyMapper;
import com.yuanchu.mom.pojo.Product;
@@ -9,6 +8,7 @@
import com.yuanchu.mom.mapper.ProductMapper;
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;
@@ -47,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,20 +61,6 @@
@Override
public String addProduct(ProductDto productDto) {
Product product = new Product();
- String required = productDto.getRequired();
- String internal = productDto.getInternal();
- if (ObjectUtils.isNotEmpty(required)){
- char requ = required.charAt(0);
- if (requ != '>' && requ != '<' && requ != '=') {
- return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
- }
- }
- if (ObjectUtils.isNotEmpty(internal)){
- char inter = internal.charAt(0);
- if (inter != '>' && inter != '<' && inter != '=') {
- return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
- }
- }
BeanUtils.copyProperties(productDto, product);
productMapper.insert(product);
return "鏂板鎴愬姛!";
@@ -83,15 +69,6 @@
//濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
@Override
public String write(Integer id, String required, String internal) {
- //鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
- char inter = internal.charAt(0);
- char requ = required.charAt(0);
- if (inter != '>' && inter != '<' && inter != '=') {
- return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
- }
- if (requ != '>' && requ != '<' && requ != '=') {
- return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
- }
Product product = new Product();
product.setId(id);
product.setRequired(required);
@@ -102,7 +79,9 @@
//鍒犻櫎
@Override
+ @Transactional(rollbackFor = Exception.class)
public void delProById(Integer id) {
+ //鍒犻櫎鎶�鏈寚鏍�
Product product = new Product();
product.setId(id);
product.setState(0);
@@ -111,11 +90,13 @@
//鎵归噺鍒犻櫎
@Override
+ @Transactional(rollbackFor = Exception.class)
public void delAllPro(String ids) {
+ //鎵归噺鍒犻櫎鎶�鏈寚鏍�
productMapper.delAllPro(ids);
}
- //鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
+ //鏍规嵁宸ヨ壓璺嚎id鏌ヨ鎶�鏈寚鏍�
@Override
public List<Product> selProByVerSpe(Integer technologyId) {
return productMapper.selProByVerSpe(technologyId);
--
Gitblit v1.9.3