From 527cbd85e37842d93d081f33916dca5c6f7156e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 09:53:58 +0800
Subject: [PATCH] 修改 9.22
---
base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
index 70cff8a..92b5905 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
@@ -1,5 +1,7 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.TechnologyTemplate;
@@ -32,9 +34,6 @@
TechnicalModelMapper technicalModelMapper;
@Resource
- TechniqueModelMapper techniqueModelMapper;
-
- @Resource
SelfcheckModelMapper selfcheckModelMapper;
@Resource
@@ -44,7 +43,13 @@
MbomModelMapper mbomModelMapper;
- //鏂板宸ヨ壓璺嚎-->閫夋嫨璁惧缁�
+ //鏂板宸ヨ壓璺嚎-->閫夋嫨绫诲瀷
+ @Override
+ public List<String> chooseType() {
+ return technologyTemplateMapper.chooseType();
+ }
+
+ //鏂板宸ヨ壓璺嚎-->閫夋嫨鐢熶骇璁惧缁�
@Override
public List<Map<String, Object>> chooseDevGroup() {
return deviceMapper.chooseDevGroup();
@@ -52,7 +57,7 @@
//鏂板宸ヨ壓璺嚎-->閫夋嫨宸ュ簭
@Override
- public List<String> chooseTech(Integer type) {
+ public List<String> chooseTech(String type) {
return technologyTemplateMapper.chooseTech(type);
}
@@ -60,16 +65,25 @@
//鏂板宸ヨ壓璺嚎
@Override
@Transactional(rollbackFor = Exception.class)
- public void addTechTemp(TechnologyTemplateDto technologyTemplateDto) {
+ public String addTechTemp(TechnologyTemplateDto technologyTemplateDto) {
+ /*鏍￠獙鏄惁娣诲姞閲嶅*/
+ if (ObjectUtils.isNotEmpty(technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query()
+ .eq("type", technologyTemplateDto.getType())
+ .eq("state", 1)
+ .eq("father", technologyTemplateDto.getFather())
+ .eq("name", technologyTemplateDto.getName())))) {
+ return "閲嶅娣诲姞!";
+ }
/*鏂板宸ヨ壓*/
TechnologyTemplate technologyTemplate = new TechnologyTemplate();
BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
technologyTemplateMapper.insert(technologyTemplate);
+ return "娣诲姞鎴愬姛!";
}
//鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟涓�绾у睍绀�
@Override
- public List<Map<String, Object>> selectAllTechTem(Integer type, String message) {
+ public List<Map<String, Object>> selectAllTechTem(String type, String message) {
return technologyTemplateMapper.selectAllTechTem(type, message);
}
@@ -106,8 +120,6 @@
technologyTemplateMapper.updateById(technologyTemplate);
//鍒犻櫎鎶�鏈寚鏍囩淮鎶よ〃
technicalModelMapper.delTeMoByTechId(id);
- //鍒犻櫎鐢熶骇宸ヨ壓缁存姢琛�
- techniqueModelMapper.delQueByTechId(id);
//鍒犻櫎鑷椤圭洰缁存姢琛�
selfcheckModelMapper.delSelfByTechId(id);
//鍒犻櫎璁板綍鍐呭缁存姢琛�
@@ -124,8 +136,6 @@
technologyTemplateMapper.delAllTech(ids);
//鎵归噺鍒犻櫎鎸囨爣缁存姢琛�
technicalModelMapper.delAllByTechId(ids);
- //鎵归噺鍒犻櫎鐢熶骇宸ヨ壓缁存姢琛�
- techniqueModelMapper.delAllByTechId(ids);
//鎵归噺鍒犻櫎鑷椤圭洰缁存姢琛�
selfcheckModelMapper.delAllByTechId(ids);
//鎵归噺鍒犻櫎璁板綍鍐呭缁存姢琛�
--
Gitblit v1.9.3