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'

---
 base-server/src/main/resources/mapper/TechniqueModelMapper.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
index b337acc..01abf4f 100644
--- a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
@@ -12,6 +12,18 @@
         <result property="unit" column="unit"/>
         <result property="name" column="name"/>
     </resultMap>
+    <!--鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎-->
+    <update id="delTechById">
+        update mom_ocean.technique_model
+        set state=0
+        where technical_model_id = #{id}
+    </update>
+    <!--鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎-->
+    <update id="delAllTech">
+        update mom_ocean.technique_model
+        set state=0
+        where technical_model_id in (${id})
+    </update>
     <select id="selectAllTeque" resultMap="selectAllTequeMap">
         select d.name dname,
                qm.id,
@@ -23,6 +35,7 @@
              mom_ocean.device d,
              mom_ocean.technology_template tt
         where qm.state = 1
+          and d.state = 1
           and d.id = qm.device_id
           and cm.id = qm.technical_model_id
           and tt.id = qm.tech_tem_id

--
Gitblit v1.9.3