From a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index d4016bb..1d33f52 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -3,7 +3,10 @@
<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}
+ and product_type > 2
</delete>
<select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
@@ -46,23 +49,23 @@
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.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
FROM product_model a
@@ -94,10 +97,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>
@@ -129,4 +132,13 @@
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>
</mapper>
--
Gitblit v1.9.1