From 76cdda8f731c4aa7d8ae0216d29f1c362dc53125 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 22 三月 2024 14:12:03 +0800
Subject: [PATCH] 表决判定
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 40c203e..31fa950 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -18,9 +18,7 @@
and ${whereSql}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY sort
</select>
<select id="getNo" resultType="java.lang.Integer">
SELECT COUNT(*)
@@ -34,7 +32,6 @@
and pid is null
</if>
</where>
- Group by product_type
</select>
<select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
select a.name, a.id
@@ -64,7 +61,8 @@
left join param_data p on p.product_id = a.id and p.page_code = 'expect'
left join sys_picture_base s on s.id = a.operat_img
WHERE a.is_delete = 0
- AND a.PID = ${productId}
+ AND ((a.PID = ${productId})
+ or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and a.product_type <> 10))
</select>
<select id="getTaskProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
@@ -73,4 +71,11 @@
where a.is_delete = 0
and a.product_type = 4
</select>
+ <select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+ select a.*
+ from product_model a
+ where a.is_delete = 0
+ and a.id = #{id}
+ </select>
+
</mapper>
--
Gitblit v1.9.1