From ac18080bb1eecb943599f4a1c8842718d089485f Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 21 三月 2024 17:11:33 +0800
Subject: [PATCH] 将RBD转换为算法库所需的XML
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 22 +++++++++++++++++-----
1 files changed, 17 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 478e530..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
@@ -52,6 +49,7 @@
a.id as dataId,
'' as statusImg,
d.dict_code as productType,
+ p.repairable as isRepair,
p.task_mtbcf_accept as taskMtbcf,
p.task_mtbcf_other_params as taskMtbcfOther,
p.reliab_distrib_type as reliabDistribType,
@@ -63,7 +61,21 @@
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">
+ select a.name, a.id
+ from product_model a
+ 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