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/TyProductModelDao.xml |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
index a8ab5de..fafc06e 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
@@ -4,34 +4,35 @@
 <mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.TyProductModelDao">
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.TyProductModel">
-        select *
-        from product_model_common
-        where is_delete = 0
+        SELECT a.*
+        FROM product_model_common a
+                 JOIN (SELECT product_type, src_id
+                       FROM product_model
+                       WHERE id = ${pid} AND is_delete = 0) AS b
+        WHERE a.is_delete = 0
           AND (
-            -- 濡傛灉瀛愭煡璇㈣繑鍥炵粨鏋滀负绌猴紝鍒欐鏌.pid鏄惁涓虹┖
-                    (SELECT src_id FROM product_model WHERE id = ${pid}  AND is_delete = 0) IS NULL
-                    AND pid IS NULL
-                OR
-                -- 鍚﹀垯锛屾鏌.pid鏄惁鍦ㄥ瓙鏌ヨ缁撴灉涓�
-                    pid IN (
-                        SELECT src_id
-                        FROM product_model
-                        WHERE id = ${pid}
-                          AND is_delete = 0
-                    )
+                    b.product_type = 3
+                    AND a.node_type &lt;&gt; 3
+                OR (
+                            b.product_type = 4
+                            AND a.node_type = 5
+                        )
+                OR (
+                            b.product_type = 2
+                            AND a.node_type &lt;&gt; 4
+                        )
             )
-        and ((node_type &gt; ${nodeType}) or ( id not in (select src_id from product_model where pid =
-        ${pid} and is_delete=0)))
-        ORDER BY
-            node_type,sort
+        ORDER BY a.node_type,
+                 a.sort;
+
+
     </select>
     <select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.TyProductModel">
         select a.name, a.id
         from product_model_common a
         where a.is_delete = 0
           and a.node_type &lt;&gt; 1
-        ORDER BY
-            node_type,sort
+        ORDER BY node_type, sort
     </select>
     <select id="getNo" resultType="java.lang.Integer">
         SELECT COUNT(*)

--
Gitblit v1.9.1