From 2902b6d147bf531b6c7cf8a971161c331f738f35 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 19 九月 2024 14:48:53 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index b85f6bd..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,10 +68,11 @@
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 and p.page_code = 'expect'
+ left join param_data p on p.product_id = a.id
left join sys_picture_base s on s.id = a.operat_img
WHERE a.is_delete = 0
AND ((a.PID = ${productId})
@@ -109,6 +111,7 @@
from product_model a
where a.is_delete = 0
and a.product_type = 2
+ order by sort
</select>
<select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
select a.*
@@ -133,9 +136,12 @@
</if>
</select>
<select id="getProductPath" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
- select *
- from product_model
- where IS_DELETE = 0
- and ship_id =${shipId}
+ select a.*, b.id as paramId
+ from product_model a,
+ param_data b
+ where a.IS_DELETE = 0
+ and b.IS_DELETE = 0
+ and a.ship_id = ${shipId}
+ and a.id = b.product_id
</select>
</mapper>
--
Gitblit v1.9.1