From 826cd5b51d5106cfea07e397eda184fb15ec7a30 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 02 八月 2024 14:33:59 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
index e6bc4e2..84d252a 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
@@ -9,11 +9,12 @@
</delete>
<select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel">
- SELECT a.id,
- a.pid,
- a.`NAME` as product,
- c.model_name,
+ SELECT b.id,
+ a.id as iid,
a.id as product_id,
+ a.pid,
+ a.`NAME` as productName,
+ c.model_name,
b.model_id,
case when b.is_disabled is null or b.is_disabled = 1 then 1 else 0 end as is_disabled,
${operatConditId} as operatConditId
@@ -38,6 +39,7 @@
)
and a.product_type in (4, 3, 2, 10)
AND a.is_delete = 0
+ ORDER BY a.product_type, a.sort
</select>
<select id="getModelList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
select *
@@ -51,4 +53,18 @@
group by model_id
</select>
+ <select id="getGKModelTrees" resultType="com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel">
+ select
+ a.*
+ FROM
+ operat_condit_model a
+ inner join operat_condit b on b.id=a.operat_condit_id
+ where
+ a.is_delete = 0
+ and b.is_delete = 0
+ <if test="productId!=null">
+ and b.product_id=${productId}
+ </if>
+ ORDER BY a.operat_condit_id, a.product_id
+ </select>
</mapper>
--
Gitblit v1.9.1