From 5f77609d5118737e135c6ca3add168ad01aa52b6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 05 十一月 2024 16:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
index 63fc4fa..4e2475b 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
@@ -7,14 +7,12 @@
select a.*,
CASE
WHEN b.end =1 THEN '宸插畬鎴�'
- WHEN c.num >0 THEN '姝ｅ湪缂栬緫'
+ WHEN a.content is not null THEN '姝ｅ湪缂栬緫'
ELSE '鏈紪杈�' END AS modelState,
d.num as quoteNum
from model_rbd a
left join (select model_id,1 as end from algorithm where model_type = 'end' and is_delete=0 ) b on b.model_id =
a.id
- left join (select id, count(1) as num from model_rbd where is_delete=0 group by id ) c on c.id
- = a.id
left join (select model_id,count(1) as num from operat_condit_model where is_delete=0 group by model_id ) d on
d.model_id = a.id
<where>
@@ -45,6 +43,16 @@
</where>
limit 1
</select>
+ <select id="getListAll" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+ select a.*,
+ CASE
+ WHEN b.end =1 THEN '宸插畬鎴�'
+ ELSE '鏈畬鎴�' END AS modelState
+ from model_rbd a
+ left join (select model_id,1 as end from algorithm where model_type = 'end' and is_delete=0 ) b on b.model_id = a.id
+ where
+ a.is_delete = 0
+ </select>
<update id="deleteByModelId">
delete
--
Gitblit v1.9.1