From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 317f5d9..176d4c2 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,7 +9,6 @@
<result column="product_id" property="productId" />
<result column="model" property="model" />
<result column="unit" property="unit" />
- <result column="speculative_trading_name" property="speculativeTradingName" />
<result column="tenant_id" property="tenantId" />
<result column="product_name" property="productName" />
<result column="product_id" property="productId" />
@@ -106,5 +105,32 @@
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>
+ <select id="selectOldProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
+ select product_model.*,product.product_name
+ from product_model left join
+ product on product_model.product_id = product.id
+ where product_model.model = #{model}
+ and product.product_name = #{productName}
+ order by product_model.id desc
+ LIMIT 1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3