From 97dea6f6d32e26d3d61db8467d0e208b498437bd Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 11:34:24 +0800
Subject: [PATCH] 修改2.0   9.20

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

diff --git a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
index aed3cf0..01abf4f 100644
--- a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
@@ -3,15 +3,27 @@
 <mapper namespace="com.yuanchu.mom.mapper.TechniqueModelMapper">
     <!--鏌ヨ鐢熶骇宸ヨ壓缁存姢鍒楄〃 鍙宠竟灞曠ず璇ュ伐鑹轰笅鑳戒娇鐢ㄧ殑璁惧鎵�鑳藉仛鐨勯」鐩�-->
     <resultMap id="selectAllTequeMap" type="map">
-        <id property="name" column="dname"/>
+        <id property="dname" column="dname"/>
         <collection property="children" resultMap="selectAllTequeMaps" javaType="List"/>
     </resultMap>
     <resultMap id="selectAllTequeMaps" type="map">
         <id property="id" column="id"/>
-        <result property="name" column="father"/>
-        <result property="name" column="unit"/>
+        <result property="father" column="father"/>
+        <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
@@ -37,7 +50,7 @@
     <resultMap id="chooseProMaps" type="map">
         <id property="id" column="technicalModelId"/>
         <result property="name" column="name"/>
-        <result property="name" column="unit"/>
+        <result property="unit" column="unit"/>
     </resultMap>
     <select id="choosePro" resultMap="chooseProMap">
         select father,
@@ -67,6 +80,8 @@
         select tt.type,
                tt.father techFather,
                tt.name   techName,
+               tt.id     tid,
+               d.id      did,
                d.name    dname,
                cm.father,
                cm.name,

--
Gitblit v1.9.3