From 664db98c9e8595ce4dd636a27f480e3a08b81ff5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 21 二月 2025 11:13:51 +0800
Subject: [PATCH] 新增可忽略的维修时间

---
 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 85de5ba..19a32ca 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -50,6 +50,12 @@
         select a.name, a.id
         from product_model a
         where a.is_delete = 0
+        <if test="type!=null and type!=''">
+            and a.product_type = ${type}
+        </if>
+        <if test="shipId!=null">
+            and a.ship_id = ${shipId}
+        </if>
     </select>
     <select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
         SELECT a.operat_img                 as imgPath,
@@ -65,7 +71,7 @@
                ''                           as statusImg,
                d.dict_code                  as productType,
                p.repairable                 as isRepair,
-               p.task_mtbcf_accept          as taskMtbcf,
+               p.task_mtbcf_regulate        as taskMtbcf,
                p.task_mtbcf_other_params2   as taskMtbcfOtherParams2,
                p.task_mtbcf_other_params3   as taskMtbcfOtherParams3,
                p.reliab_distrib_type        as reliabDistribType,
@@ -161,7 +167,7 @@
                a.name,
                a.product_type,
                a.name_path,
-               a.same_sb_name,
+               b.basic_unit_num as sameSbNum,
                a.equip_type,
                b.reliab_distrib_type,
                b.basic_join_compute,
@@ -185,5 +191,27 @@
           and a.ship_id = ${shipId}
           AND a.id &lt;&gt; a.ship_id
           and a.id = b.product_id
+          and a.product_type = 5
+    </select>
+    <select id="getProductListByShip" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+        select a.*, b.basic_unit_num as sameSbNum
+        from product_model a,
+        param_data b
+        where a.IS_DELETE = 0 and b.IS_DELETE = 0
+        and a.id = b.product_id
+        <if test="productId !=null">
+            and a.ship_id = #{productId}
+        </if>
+        <if test="level1 !=null">
+            and a.product_type &gt;= #{level1}
+        </if>
+        <if test="level2 !=null">
+            and a.product_type &lt;= #{level2}
+        </if>
+    </select>
+    <select id="getProductListAll" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+        select id, operat_img
+        from product_model
+        where IS_DELETE = 0
     </select>
 </mapper>

--
Gitblit v1.9.1