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/resources/mapper/TechniqueMapper.xml |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/standard-server/src/main/resources/mapper/TechniqueMapper.xml b/standard-server/src/main/resources/mapper/TechniqueMapper.xml
index 8f15432..dfa3f44 100644
--- a/standard-server/src/main/resources/mapper/TechniqueMapper.xml
+++ b/standard-server/src/main/resources/mapper/TechniqueMapper.xml
@@ -88,6 +88,25 @@
                                 where technology.state = 1
                                   and specifications_id = #{specificationsId})
     </select>
+    <!--鏍规嵁宸ヨ壓璺嚎id鏌ヨ鎵�鏈夌増鏈�-->
+    <select id="selectVerByTeId" resultType="java.lang.Integer">
+        select distinct version
+        from mom_ocean.technique
+        where state = 1
+          and technology_id = #{technologyId}
+    </select>
+
+    <!--鏌ヨ璇ュ伐鑹轰笅鏈�鏂扮増鏈湪涓�涓楠岄」鐩笅鍙互浣跨敤鍝簺璁惧-->
+    <select id="selDevByVerTecIdFaNam" resultType="java.util.Map">
+        select device.id, device
+        from mom_ocean.technique
+                 left join mom_ocean.device on name = device
+        where technique.state = 1
+          and technology_id = #{technologyId}
+          and product_father = #{father}
+          and product = #{name}
+          and version = #{ver}
+    </select>
 
     <!--鏍规嵁宸ヨ壓璺嚎id鍒犻櫎鐢熶骇宸ヨ壓-->
     <update id="delTeqByTecId">

--
Gitblit v1.9.3