From da6410b1823f95a447869d9b4fdaed32a62b4518 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 30 十月 2023 16:05:30 +0800
Subject: [PATCH] 模具修改
---
hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentGoodsMapper.xml | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentGoodsMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentGoodsMapper.xml
index 0224159..eeb2776 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentGoodsMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentGoodsMapper.xml
@@ -27,6 +27,10 @@
<if test="embedmentType != null">
and embedment_type=#{embedmentType}
</if>
+ <if test="embedmentModel != null">
+ and embedment_model=#{embedmentModel}
+ </if>
+
</select>
<insert id="insert" >
@@ -129,14 +133,18 @@
sag.remark as remark,
sd.dict_name as dictName
from sys_embedment_goods sag
- left join sys_dict sd on sag.assist_type=sd.dict_id
+ left join sys_dict sd on sag.embedment_type=sd.dict_id
where sag.is_use=1
- <if test="assistName!=null and assistName!='' ">
- and sag.assist_name like concat('%',#{assistName},'%')
+ <if test="embedmentName!=null and embedmentName!='' ">
+ and sag.embedment_name like concat('%',#{embedmentName},'%')
</if>
<if test="companyId!=null and companyId!='' ">
and sag.company_id=#{companyId}
</if>
+ <if test="id!=null and id!='' ">
+ and sag.id=#{id}
+ </if>
+
order by sag.create_time desc
</select>
<select id="findEntity" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.embedment.entity.SysEmbedmentGoodsEntity">
@@ -152,8 +160,8 @@
sag.create_time as createTime,
sag.remark as remark,
sd.dict_name as dictName from sys_embedment_goods sag left join sys_dict sd
- on sag.assist_type=sd.dict_id
- where sag.is_use=1 and sag.id=#{assistId}
+ on sag.embedment_type=sd.dict_id
+ where sag.is_use=1 and sag.id=#{id}
</select>
<update id="delete" parameterType="java.lang.String" >
update sys_embedment_goods set
@@ -220,8 +228,5 @@
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
- <select id="assistGood" parameterType="java.lang.String" resultType="java.lang.String">
- select id from sys_assist_record where assist_id=#{assistId} and is_use=1
- </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3