From 88490578da41d38ed754b6b3e4d63ab2c2ccf666 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 22 三月 2024 00:57:03 +0800
Subject: [PATCH] 修改bug：1）将connect、vote、switch替换成vnode时遗漏了向modelNodeAndVnodeList添加此此节点。2）algorithm中遗漏了设置vote算法的voteNum。
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index b6e6b28..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,11 +32,50 @@
and pid is null
</if>
</where>
- Group by node_type
</select>
<select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
- select a.name,a.id
+ select a.name, a.id
from product_model a
- where a.is_delete =0 and a.node_type = 5
+ where a.is_delete = 0
+ and a.product_type = 5
</select>
+ <select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
+ SELECT a.operat_img as imgPath,
+ a.`NAME` as imgName,
+ 'node' as nodeType,
+ '' as nodeTypeExt,
+ s.width as imgWidth,
+ s.height as imgHeight,
+ 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,
+ p.repair_distrib_type as repairDistribType,
+ p.repair_mttcr as RepairMttcr,
+ p.repair_mttcr_other_params as RepairMttcrOther
+ FROM product_model a
+ left join sys_dict_data d on d.DICT_VALUE = a.product_type and dict_type_id = '1728965873022050306'
+ 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})
+ 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