From c80aedf517205fd50e608efc17ead73a3667d506 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:39:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml | 38 +++++++++++++++++++++++---------------
1 files changed, 23 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..344618a 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml
@@ -4,26 +4,33 @@
<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 PMC.*
+ FROM product_model_common PMC
+ JOIN (SELECT product_type, src_id
+ FROM product_model
+ WHERE id = ${pid} AND is_delete = 0) AS PM ON TRUE
+ WHERE PMC.is_delete = 0
+ AND (
+ PM.product_type = 3
+ AND (CASE WHEN pm.src_id IS NULL THEN node_type > 3 ELSE pid IN (src_id) END)
+ OR (
+ PM.product_type != 3
+ AND (CASE WHEN pm.src_id IS NULL THEN pid IS NULL ELSE pid IN (src_id) END)
+ )
+ )
+ ORDER BY PMC.node_type,
+ PMC.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 <> 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 +39,7 @@
<if test="pid==null">
and pid is null
</if>
+ and node_type =${nodeType}
</where>
Group by node_type
</select>
--
Gitblit v1.9.1