From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
index 7ccdfc7..be8ec96 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
@@ -42,8 +42,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);
}
//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨璁惧
@@ -60,24 +60,10 @@
//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓
@Override
- public void addTechnique(Integer technologyId, TechniqueDto techniqueDto) {
+ public void addTechnique(TechniqueDto techniqueDto) {
Technique technique = new Technique();
BeanUtils.copyProperties(techniqueDto, technique);
- technique.setTechnologyId(technologyId);
techniqueMapper.insert(technique);
- }
-
- //娣诲姞鍚屼竴涓瀷鍙风敓浜у伐鑹虹殑鐗堟湰
- @Override
- public Integer addVersion(Integer specificationsId,Integer version) {
- List<Technique> techniqueList = techniqueMapper.selAllBySpeId(specificationsId,version);
- for (Technique technique : techniqueList) {
- technique.setId(null);
- //鏈�鏂扮増鏈�+1
- technique.setVersion(techniqueMapper.selectVerByTeq(specificationsId).get(0)+1);
- }
- saveBatch(techniqueList);
- return techniqueList.get(0).getVersion();
}
//鍒犻櫎
@@ -94,5 +80,23 @@
public void delAllTeq(String ids) {
techniqueMapper.delAllTeq(ids);
}
+
+ //鏍规嵁id鏌ョ湅璇︽儏
+ @Override
+ public List<Map<String, Object>> selTeqById(Integer id) {
+ return techniqueMapper.selTeqById((id));
+ }
+
+ //缂栬緫
+ @Override
+ public String wriTeqById(Integer id, String product, String productFather, String unit) {
+ Technique technique = new Technique();
+ technique.setId(id);
+ technique.setProduct(product);
+ technique.setProductFather(productFather);
+ technique.setUnit(unit);
+ techniqueMapper.updateById(technique);
+ return "淇敼鎴愬姛!";
+ }
}
--
Gitblit v1.9.3