From e977e3a34db9cc319d84145755b7b0f211df8336 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 07 四月 2026 15:19:19 +0800
Subject: [PATCH] feat(production): 添加设备名称字段到工单DTO及映射
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index e12b63c..2f84ce8 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -97,5 +97,32 @@
ORDER BY pm.id DESC
</select>
+ <select id="getProductAndModelList" resultType="java.util.Map">
+ select p.id as id,
+ pm.id as modelId,
+ p.product_name as productName ,
+ pm.model as model
+ from product_model pm
+ left join product p on p.id = pm.product_id
+ order by p.id,pm.id desc
+ </select>
+ <select id="selectModelListByProductIds" resultType="com.ruoyi.basic.pojo.ProductModel">
+ WITH RECURSIVE tree AS (
+ SELECT id
+ FROM product
+ WHERE id in <foreach item="id" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN tree t ON p.parent_id = t.id
+ )
+ SELECT t1.*
+ FROM product_model t1
+ INNER JOIN product t2 ON t1.product_id = t2.id
+ INNER JOIN tree t ON t2.id = t.id;
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3