From fd6cd17c0f7a095be934f9e1d1fd7c3e10cad433 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期二, 21 五月 2024 08:45:39 +0800
Subject: [PATCH] svgEditor以及RBD画图拖动自动吸附在一条线上
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 9a7b443..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,29 +32,55 @@
<if test="pid==null">
and pid is null
</if>
+ and product_type =${productType}
</where>
- Group by node_type
+ Group by product_type
</select>
<select id="getProductList" 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.node_type = 5
+ and a.product_type = 5
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
- SELECT a.operational_status as imgPath,
- a.`NAME` as imgName,
- 'node' as nodeType,
- '' as nodeTypeExt,
- 60 as imgWidth,
- 60 as imgHeight,
- a.id as dataId,
- '' as statusImg,
- d.dict_code as productType
+ 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_params as taskMtbcfOther,
+ p.reliab_distrib_type as reliabDistribType,
+ p.repair_distrib_type as repairDistribType,
+ p.repair_mttcr as RepairMttcr,
+ p.repair_mttcr_other_params as RepairMttcrOther
FROM product_model a
- left join sys_dict_data d on d.DICT_VALUE = a.node_type and dict_type_id = '1728965873022050306' --
+ 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="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