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 |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
index c728ca0..fafc06e 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
@@ -4,26 +4,39 @@
 <mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.TyProductModelDao">
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.TyProductModel">
-        select a.*
-        from ty_product_model a
-        <where>
-            a.is_delete = 0
-            <if test="nodeType!=null and nodeType!=''">
-                and a.node_type = ${nodeType}
-            </if>
-        </where>
-        <if test="orderBySql!=null">
-            ORDER BY ${orderBySql}
-        </if>
+        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 (
+                    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
+                        )
+            )
+        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 ty_product_model a
-        where a.is_delete =0 and a.node_type != 1
+        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
     </select>
     <select id="getNo" resultType="java.lang.Integer">
         SELECT COUNT(*)
-        FROM ty_product_model
+        FROM product_model_common
         <where>
             is_delete = 0
             <if test="pid!=null">
@@ -32,6 +45,7 @@
             <if test="pid==null">
                 and pid is null
             </if>
+            and node_type =${nodeType}
         </where>
         Group by node_type
     </select>

--
Gitblit v1.9.1