From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/technology/TechnologyBomMapper.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/technology/TechnologyBomMapper.xml b/src/main/resources/mapper/technology/TechnologyBomMapper.xml
index 619a04a..267b1f5 100644
--- a/src/main/resources/mapper/technology/TechnologyBomMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyBomMapper.xml
@@ -16,4 +16,27 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <select id="listPage" resultType="com.ruoyi.technology.bean.vo.TechnologyBomVo">
+ select tb.*,
+ pm.model as productModelName,
+ p.product_name as productName
+ from technology_bom tb
+ left join product_model pm on tb.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ <where>
+ <if test="c.productModelName != null and c.productModelName != ''">
+ and pm.model like concat('%', #{c.productModelName}, '%')
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%', #{c.productName}, '%')
+ </if>
+ <if test="c.bomNo != null and c.bomNo != ''">
+ and tb.bom_no like concat('%', #{c.bomNo}, '%')
+ </if>
+ <if test="c.version != null and c.version != ''">
+ and tb.version = #{c.version}
+ </if>
+ </where>
+ order by tb.id desc
+ </select>
</mapper>
--
Gitblit v1.9.3