From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 60c39a8..91e3d92 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -46,7 +46,6 @@
select a.name, a.id
from product_model a
where a.is_delete = 0
- and a.product_type = 1
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
SELECT a.operat_img as imgPath,
@@ -54,6 +53,8 @@
'node' as nodeType,
'' as nodeTypeExt,
s.svg_content as svgContent,
+ s.anchors_content as anchorsContent,
+ s.anchors_points as anchorsPoints,
s.width as imgWidth,
s.height as imgHeight,
a.id as dataId,
@@ -67,7 +68,8 @@
p.repair_distrib_type as repairDistribType,
p.repair_mttcr as repairMttcr,
p.repair_mttcr_other_params2 as repairMttcrOtherParams2,
- p.repair_mttcr_other_params3 as repairMttcrOtherParams3
+ p.repair_mttcr_other_params3 as repairMttcrOtherParams3,
+ p.task_mtbcf_regul_succ_rate as success_rate
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
--
Gitblit v1.9.1