From 27c85203ba0262d60c6733034fa851d4b738760e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期二, 02 四月 2024 17:14:05 +0800
Subject: [PATCH] 新增表格单元格居右
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 478e530..b4287cb 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -18,9 +18,7 @@
and ${whereSql}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY sort
</select>
<select id="getNo" resultType="java.lang.Integer">
SELECT COUNT(*)
@@ -43,7 +41,7 @@
and a.product_type = 5
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
- SELECT a.operat_img as imgPath,
+ SELECT a.operat_img as imgPath,
a.`NAME` as imgName,
'node' as nodeType,
'' as nodeTypeExt,
@@ -52,6 +50,7 @@
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,
@@ -63,7 +62,22 @@
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="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