From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java
index 9b37d8c..8c07dba 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java
@@ -62,7 +62,15 @@
//(4绾�)鏂板-->鍨嬪彿
@Override
- public void addSpecifications(SpecificationsDto specificationsDto) {
+ public String addSpecifications(SpecificationsDto specificationsDto) {
+ //鏍￠獙娣诲姞璇ユ爣鍑嗕笅鐨勫瀷鍙锋槸鍚﹂噸澶�
+ List<String> specificationsNameList = specificationsMapper.selectList(Wrappers.<Specifications>query().eq("standard_id", specificationsDto.getId())).stream().map(specifications -> {
+ String specificationsName = specifications.getName();
+ return specificationsName;
+ }).collect(Collectors.toList());
+ if (specificationsNameList.contains(specificationsDto.getSpecifications())){
+ return "璇ユ爣鍑嗕笅鏈夎鍨嬪彿";
+ }
/*鏂板鍨嬪彿琛�*/
Specifications specifications = new Specifications();
specifications.setStandardId(specificationsDto.getId());
@@ -135,6 +143,7 @@
}
}
techniqueService.saveBatch(techniqueList);
+ return "娣诲姞鍨嬪彿銆�"+ specificationsDto.getSpecifications() +"銆戞垚鍔燂紒";
}
/**
--
Gitblit v1.9.3