From 5d24aead2d1a45452942ddfc300fe6a232301a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml b/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
index 1ec0742..f838547 100644
--- a/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.ProcessInspectMapper">
- <!--灏嗘楠岀姸鎬佷慨鏀逛负null-->
- <update id="updById">
- update mom_ocean.process_inspect set result=null where id=#{rawInspectId}
- </update>
<!--鏂板杩囩▼妫�楠屽崟-鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧淇℃伅鍜屽伐鑹�-->
<resultMap id="oneMap" type="map">
<id property="name" column="material"/>
@@ -19,7 +15,7 @@
<collection property="children" resultMap="threeMap" javaType="List"/>
</resultMap>
<resultMap id="threeMap" type="map">
- <id property="id" column="technologyId"/>
+ <id property="id" column="mtId"/>
<result property="name" column="techname"/>
</resultMap>
<select id="chooseMater" resultMap="oneMap">
@@ -27,7 +23,7 @@
code,
specifications,
unit,
- technology_id technologyId,
+ mt.id mtId,
techfather,
techname
from mom_ocean.manual_technology mt
@@ -124,4 +120,4 @@
and result =#{result}
</if>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3