From 4a476243e0928236472f0a916467630cb5706ee5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 17 五月 2024 11:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
index 1225051..b8917aa 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
@@ -6,12 +6,17 @@
<select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
select a.*,
CASE
- WHEN b.end =1 THEN '宸插畬鎴�'
- WHEN c.num >0 THEN '姝ｅ湪缂栬緫'
- ELSE '鏈紪杈�' END AS modelState
+ WHEN b.end =1 THEN '宸插畬鎴�'
+ WHEN c.num >0 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' ) b on b.model_id = a.id
- left join (select model_id, count(1) as num from algorithm group by model_id ) c on c.model_id = a.id
+ 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 model_id, count(1) as num from algorithm where is_delete=0 group by model_id ) c on c.model_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>
a.is_delete = 0
<if test="productId!=null and productId!=''">
@@ -31,6 +36,15 @@
</where>
limit 1
</select>
+ <select id="getDiagramOfXDY" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+ select a.*
+ from model_rbd a
+ <where>
+ a.is_delete = 0
+ and a.product_id =${productId}
+ </where>
+ limit 1
+ </select>
<update id="deleteByModelId">
delete
--
Gitblit v1.9.1