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 | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
index 30b878d..fafc06e 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
@@ -4,28 +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 a.*
- from product_model_common a
- <where>
- a.is_delete = 0
- <if test="nodeType!=null and nodeType!=''">
- and a.node_type = ${nodeType}
- <if test="nodeType==1">
- and a.pid = (select src_id from product_model where id = ${pid})
- </if>
- <if test="nodeType==2">
- and a.id not in (select src_id from product_model where PID = ${pid})
- </if>
- </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 <> 3
+ OR (
+ b.product_type = 4
+ AND a.node_type = 5
+ )
+ OR (
+ b.product_type = 2
+ AND a.node_type <> 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
+ select a.name, a.id
from product_model_common a
- where a.is_delete =0 and a.node_type != 1
+ where a.is_delete = 0
+ and a.node_type <> 1
+ ORDER BY node_type, sort
</select>
<select id="getNo" resultType="java.lang.Integer">
SELECT COUNT(*)
@@ -38,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