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/mapper/TechnologyMapper.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyMapper.java
index 3366794..0f74e7a 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyMapper.java
@@ -23,11 +23,17 @@
     List<Map<String, Object>> selectAllTec(Integer specificationsId, Integer version,String message);
 
     //鍙充笂瑙掓柊澧�-->宸ヨ壓璺嚎-->閫夋嫨宸ュ簭
-    List<Map<String, Object>> chooseFather(Integer specificationsId);
+    List<Map<String, Object>> chooseFather(Integer specificationsId,Integer version);
 
-    //鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨宸ュ簭,宸ヨ壓
-    List<Map<String, Object>> chooseTech(Integer specificationsId);
+    //鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍� 鐗╂枡娓呭崟 鐢熶骇宸ヨ壓-->閫夋嫨宸ュ簭,宸ヨ壓
+    List<Map<String, Object>> chooseTech(Integer specificationsId,Integer version);
 
     //鎵归噺鍒犻櫎
     void delAllTech(String ids);
+
+    //鏌ヨ璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑宸ヨ壓id
+    Integer selTech(String techfather, String techname, Integer version, Integer specificationId);
+
+    //鏌ヨ璇ュ瀷鍙蜂笅鐗堟湰涓嬬殑鎵�鏈夋暟鎹�
+    List<Technology> selAllByVerSpId(Integer spId, Integer ver);
 }

--
Gitblit v1.9.3