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/StandardServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java
index 647020d..bab7259 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java
@@ -61,7 +61,15 @@
//(3绾�)鏂板-->鏍囧噯,鍨嬪彿
@Override
@Transactional(rollbackFor = Exception.class)
- public void addStandard(StandardDto standardDto) {
+ public String addStandard(StandardDto standardDto) {
+ //鏍￠獙娣诲姞璇ョ墿鏂欎笅鐨勬爣鍑嗘槸鍚﹂噸澶�
+ List<String> standNameList = standardMapper.selectList(Wrappers.<Standard>query().eq("material_id", standardDto.getId())).stream().map(standard -> {
+ String standardName = standard.getName();
+ return standardName;
+ }).collect(Collectors.toList());
+ if (standNameList.contains(standardDto.getStandard())){
+ return "璇ヤ骇鍝佷笅鏈夎鏍囧噯";
+ }
/*鏂板鏍囧噯琛�*/
Standard standard = new Standard();
standard.setMaterial_id(standardDto.getId());
@@ -139,6 +147,7 @@
}
}
techniqueService.saveBatch(techniqueList);
+ return "娣诲姞鏍囧噯銆�"+ standardDto.getStandard() +"銆戞垚鍔燂紒";
}
}
--
Gitblit v1.9.3