From 4bff52e938ae2c260fe54d32ef680908868bb27e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 07 六月 2024 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml | 26 ++++++++++++++++++++++----
1 files changed, 22 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 670531e..e6bc4e2 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
@@ -2,14 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.OperatConditModelDao">
+ <delete id="deleteByOperatConditId">
+ delete
+ from operat_condit_model
+ where operat_condit_id = ${operatConditId}
+ </delete>
<select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel">
- SELECT a.id ,
- a.pid ,
- a.`NAME` as product,
+ SELECT a.id,
+ a.pid,
+ a.`NAME` as product,
c.model_name,
+ a.id as product_id,
b.model_id,
- b.id as operatConditModelId
+ case when b.is_disabled is null or b.is_disabled = 1 then 1 else 0 end as is_disabled,
+ ${operatConditId} as operatConditId
FROM product_model a
LEFT JOIN operat_condit_model b
ON b.product_id = a.id
@@ -32,5 +39,16 @@
and a.product_type in (4, 3, 2, 10)
AND a.is_delete = 0
</select>
+ <select id="getModelList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+ select *
+ from model_rbd
+ where product_id = ${productId}
+ and is_delete = 0
+ </select>
+ <select id="getModelNodes" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNodes">
+ SELECT model_id, GROUP_CONCAT(node_id) as nodeIds
+ FROM `model_rbd_node`
+ group by model_id
+ </select>
</mapper>
--
Gitblit v1.9.1