From 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 23 十月 2024 11:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
index 2cd456b..4e2475b 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelRbdDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelRbdDao">
- <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
+ <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 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' ) 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 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!=''">
@@ -22,7 +25,7 @@
</if>
</where>
</select>
- <select id="getDiagram" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
+ <select id="getDiagram" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
select a.*
from model_rbd a
<where>
@@ -31,6 +34,25 @@
</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>
+ <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