From 4a476243e0928236472f0a916467630cb5706ee5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 17 五月 2024 11:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index eb31c85..9dbaf1e 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -4,10 +4,10 @@
<mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao">
<select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
- select a.*
- from product_model a
+ select *
+ from product_model
<where>
- a.is_delete = 0
+ is_delete = 0
<if test="pid!=null">
and pid =${pid}
</if>
@@ -18,9 +18,8 @@
and ${whereSql}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY
+ product_type,sort
</select>
<select id="getNo" resultType="java.lang.Integer">
SELECT COUNT(*)
@@ -33,6 +32,7 @@
<if test="pid==null">
and pid is null
</if>
+ and product_type =${productType}
</where>
Group by product_type
</select>
@@ -43,15 +43,17 @@
and a.product_type = 5
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
- SELECT a.default_img as imgPath,
+ SELECT a.operat_img as imgPath,
a.`NAME` as imgName,
'node' as nodeType,
'' as nodeTypeExt,
- 60 as imgWidth,
- 60 as imgHeight,
+ 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_params as taskMtbcfOther,
p.reliab_distrib_type as reliabDistribType,
@@ -61,16 +63,24 @@
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}
+ 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="getDefaultImg" resultType="java.lang.String">
- SELECT b.id
- FROM sys_picture_base a
- LEFT JOIN sys_oss b ON a.id = b.BUSI_ID
- WHERE a.IS_DELETE = 0
- AND b.IS_DELETE = 0
- AND a.CONTENT_TYPE = '榛樿璁惧'
+ <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