From ada810aa38609da55b0f348b86cc8a8d8ace0efb Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 15 十月 2024 15:08:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 74 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index d111bc8..d14dfec 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -3,7 +3,14 @@
<mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao">
<delete id="deleteByShipId">
- delete from product_model where ship_id =${shipId} and product_type > 2
+ delete
+ from product_model
+ where ship_id = ${shipId}
+ </delete>
+ <delete id="deleteByPid">
+ delete
+ from product_model
+ where PID = ${id}
</delete>
<select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
@@ -43,31 +50,33 @@
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,
- a.`NAME` as imgName,
- 'node' as nodeType,
- '' as nodeTypeExt,
- s.svg_content as svgContent,
- 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,
+ SELECT a.operat_img as imgPath,
+ a.`NAME` as imgName,
+ '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,
+ '' as statusImg,
+ d.dict_code as productType,
+ p.repairable as isRepair,
+ p.task_mtbcf_accept as taskMtbcf,
p.task_mtbcf_other_params2 as taskMtbcfOtherParams2,
p.task_mtbcf_other_params3 as taskMtbcfOtherParams3,
- p.reliab_distrib_type as reliabDistribType,
- p.repair_distrib_type as repairDistribType,
- p.repair_mttcr as repairMttcr,
+ p.reliab_distrib_type as reliabDistribType,
+ 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})
@@ -94,10 +103,10 @@
where product_id in (
select id
from product_model
- where is_delete = 0 and pid = ${productId}
+ where is_delete = 0
+ and pid = ${productId}
)
)
-
</select>
@@ -106,6 +115,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.*
@@ -121,4 +131,26 @@
and a.product_type > 2
</select>
+ <select id="getProductTree" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+ select a.*
+ from product_model a
+ where a.is_delete = 0
+ <if test="shipId!=null">
+ and a.ship_id = #{shipId}
+ </if>
+ </select>
+ <select id="getProductPath" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+ 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>
+ <select id="getByPid" resultType="java.lang.Long">
+ select id
+ from product_model
+ where IS_DELETE=0 and PID=${id}
+ </select>
</mapper>
--
Gitblit v1.9.1