From 19beea5d5dc165efb0feca7c4c0a296819010178 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 04 十二月 2024 11:16:17 +0800
Subject: [PATCH] 修改bug：传给仿真算法包的modelId重复。（将工况ID改为阶段模型ID）
---
modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 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..ebfe0a8 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml
@@ -2,35 +2,67 @@
<!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 b.id,
+ a.id as iid,
+ a.id as product_id,
+ a.pid,
+ a.`NAME` as productName,
c.model_name,
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
AND b.operat_condit_id = ${operatConditId}
LEFT JOIN model_rbd c ON c.id = b.model_id
- WHERE a.id in (
- SELECT DATA.id
- FROM (
- SELECT @ids as ids,
- (SELECT @ids := GROUP_CONCAT(id)
- FROM product_model
- WHERE FIND_IN_SET(pid, @ids)
- ) as cids
- FROM product_model
- WHERE @ids IS NOT NULL AND @ids := ${productId}
- ) id,
- product_model DATA
- WHERE FIND_IN_SET(DATA.id, ID.ids)
- )
+ Where
+ a.ship_id = ${productId}
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 *
+ from model_rbd
+ where ship_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>
+ <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>
+ <select id="getGKModelAssembled" resultType="com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel">
+ select
+ a.*
+ FROM
+ operat_condit_model a
+ where
+ a.is_delete = 0
+ and a.is_disabled = 0
+ and a.operat_condit_id=#{gkId}
+ </select>
</mapper>
--
Gitblit v1.9.1