From 3d72db70fcb406e02b283c4b624e8282ed301422 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 14 十月 2024 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/TaskBinoParamDao.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskBinoParamDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskBinoParamDao.xml
index 94eee5f..bc584f3 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskBinoParamDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskBinoParamDao.xml
@@ -51,7 +51,7 @@
and f.is_delete = 0
and g.product_id = f.id
and g.is_delete = 0
- and g.reliab_distrib_type = 2
+ and g.reliab_distrib_type = 3
) a
left join task_bino_param b on
b.task_id = ${taskId}
@@ -62,4 +62,14 @@
order by a.phase_id, a.operat_condit_id, a.product_id
</select>
+ <select id="getBinoParams" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskBinoParam">
+ select a.*
+ from
+ task_bino_param a
+ where
+ a.IS_DELETE=0
+ <if test="shipId!=null">
+ and a.task_id = #{taskModelId}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.1