From a86c2eb2db34d2d350e5c2eb72bf6416ec89c0d2 Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期二, 19 十一月 2024 11:43:03 +0800 Subject: [PATCH] 1)可靠性评定时新增模型检查处理; 2)获取任务二项分布参数时,去掉模型的匹配。 --- modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml index 84acf4f..ebfe0a8 100644 --- a/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml +++ b/modules/mainPart/src/main/resources/mapper/taskReliability/OperatConditModelDao.xml @@ -23,20 +23,8 @@ 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 @@ -44,7 +32,7 @@ <select id="getModelList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd"> select * from model_rbd - where product_id = ${productId} + where ship_id = ${productId} and is_delete = 0 </select> <select id="getModelNodes" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNodes"> -- Gitblit v1.9.1