From 1b765e3dfdf8ab0d38e587a0a8beaee47a60e32c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 26 七月 2024 14:08:58 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 9dbaf1e..d4016bb 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -2,6 +2,9 @@
 <!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 &gt; 2
+    </delete>
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
         select *
@@ -32,7 +35,7 @@
             <if test="pid==null">
                 and pid is null
             </if>
-        and product_type =${productType}
+            and product_type =${productType}
         </where>
         Group by product_type
     </select>
@@ -40,7 +43,7 @@
         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,
@@ -55,11 +58,13 @@
                d.dict_code                 as productType,
                p.repairable                as isRepair,
                p.task_mtbcf_accept         as taskMtbcf,
-               p.task_mtbcf_other_params   as taskMtbcfOther,
+               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_params as RepairMttcrOther
+               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'
@@ -68,13 +73,39 @@
           AND ((a.PID = ${productId})
             or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and
                 a.product_type &lt;&gt; 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 &lt;&gt; ${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="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
+          and a.product_type = 2
     </select>
     <select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
         select a.*
@@ -82,5 +113,20 @@
         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 &gt; 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>
 </mapper>

--
Gitblit v1.9.1