From c80aedf517205fd50e608efc17ead73a3667d506 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:39:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 127 ++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 29 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 94f638d..1d33f52 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -2,12 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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>
<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 +24,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 +38,7 @@
<if test="pid==null">
and pid is null
</if>
+ and product_type =${productType}
</where>
Group by product_type
</select>
@@ -40,36 +46,99 @@
select a.name, a.id
from product_model a
where a.is_delete = 0
- and a.product_type = 5
+ and a.product_type = 1
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
- SELECT a.default_img as imgPath,
- a.`NAME` as imgName,
- 'node' as nodeType,
- '' as nodeTypeExt,
- s.width as imgWidth,
- s.height as imgHeight,
- a.id as dataId,
- '' as statusImg,
- d.dict_code as productType,
- 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
+ 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.repair_mttcr_other_params2 as repairMttcrOtherParams2,
+ p.repair_mttcr_other_params3 as repairMttcrOtherParams3
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.default_img
+ 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))
+ and a.id not in (
+ select node_id
+ from model_rbd_node
+ where product_id in (
+ select pid
+ from product_model
+ where id = ${productId}
+ and is_delete = 0
+ union
+ select id
+ from product_model
+ where is_delete = 0
+ and pid = ${parentId}
+ and id <> ${productId}
+ )
+ union
+ select node_id
+ from model_rbd_node
+ where product_id in (
+ select id
+ from product_model
+ where is_delete = 0
+ and pid = ${productId}
+ )
+ )
+
</select>
- <select id="getDefaultImg" resultType="java.lang.String">
- SELECT a.id
- FROM sys_picture_base a
- WHERE a.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 = 2
+ </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>
+ <select id="getByShipId" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+ select a.*
+ from product_model a
+ where a.is_delete = 0
+ and a.ship_id = #{shipId}
+ 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>
</mapper>
--
Gitblit v1.9.1