From fe295552e5a3b010b5a6a60a1e2a94bc39b49d68 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 06 八月 2024 15:37:09 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 77 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 17a7338..60c39a8 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -2,6 +2,12 @@
<!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 *
@@ -40,29 +46,31 @@
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.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
+ 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 param_data p on p.product_id = a.id
left join sys_picture_base s on s.id = a.operat_img
WHERE a.is_delete = 0
AND ((a.PID = ${productId})
@@ -89,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>
@@ -100,7 +108,8 @@
select a.name, a.id
from product_model a
where a.is_delete = 0
- and a.product_type = 4
+ and a.product_type = 2
+ order by sort
</select>
<select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
select a.*
@@ -108,5 +117,29 @@
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