From 9538bdb6ee3714e030d41807e6ab46cd6258d590 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期二, 26 九月 2023 08:43:12 +0800
Subject: [PATCH] 调整预埋件
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java
index 7e3b982..fd26613 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java
@@ -21,11 +21,9 @@
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* @Author QiuYuHao
@@ -56,7 +54,8 @@
sysEmbedmentGoodsEntity.setCompanyId(sysUserInfo.getCompanyId());
String embedmentName = sysEmbedmentGoodsEntity.getEmbedmentName();
String embedmentType = sysEmbedmentGoodsEntity.getEmbedmentType();
- String id = sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType);
+ String embedmentModel = sysEmbedmentGoodsEntity.getEmbedmentModel();
+ String id = sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType, embedmentModel);
if(!StringUtil.isEmpty(id)){
return BasicResult.faild("11111","error","名称和规格型号不可重复");
}
@@ -76,8 +75,9 @@
sysEmbedmentGoodsEntity.setCompanyId(sysUserInfo.getCompanyId());
String embedmentName = sysEmbedmentGoodsEntity.getEmbedmentName();
String embedmentType = sysEmbedmentGoodsEntity.getEmbedmentType();
- String id = sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType);
- if(!StringUtil.isEmpty(id)){
+ String embedmentModel = sysEmbedmentGoodsEntity.getEmbedmentModel();
+ String id = sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType, embedmentModel);
+ if(!StringUtil.isEmpty(id) && !sysEmbedmentGoodsEntity.getId().equals(id)){
return BasicResult.faild("11111","error","名称和规格型号不可重复");
}
sysEmbedmentGoodsMapper.update(sysEmbedmentGoodsEntity);
@@ -102,10 +102,8 @@
@Override
- public BasicResult findAllDetails() {
- List<String> modelList = sysEmbedmentGoodsMapper.findAll(null)
- .stream().map(s -> s.getEmbedmentModel()).collect(Collectors.toList());
- return BasicResult.success(modelList);
+ public BasicResult findAllDetails(String id) {
+ return BasicResult.success(sysEmbedmentGoodsMapper.findEntity(id).getEmbedmentModel());
}
//=======================种类到此结束=======================
--
Gitblit v1.9.3