From a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
index 6112800..6d3d256 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
@@ -104,11 +104,23 @@
and d.model_id = e.id
order by c.CREATE_DATE
</select>
- <select id="getModelList" resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel">
+ <select id="getModelList"
+ resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel">
SELECT *
FROM simulat_assess_task_phase_model
WHERE fz_id = ${fzId}
AND is_delete = 0
order by sort
</select>
+ <select id="getModelByProductGk" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+ select a.*
+ from model_rbd a,
+ operat_condit_model b
+ where a.id = b.model_id
+ and b.operat_condit_id = ${gkId}
+ and b.product_id = ${productId}
+ and a.is_delete = 0
+ and b.is_delete = 0
+ limit 1
+ </select>
</mapper>
--
Gitblit v1.9.1