From c80aedf517205fd50e608efc17ead73a3667d506 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:39:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
index ebf1303..d7edc5b 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
@@ -9,13 +9,22 @@
, a.NAME as operatConditName
, a.id as operatConditId
, case
- when b.id is null then 0
- else 1 end as isCheck
+ when b.operat_condit_duration_rate >'0' then 1
+ else 0 end as isCheck
FROM operat_condit a
left join task_phase_model b
on a.id = b.operat_condit_id and b.is_delete = 0 and b.phase_id = ${phaseId}
WHERE a.IS_DELETE = 0
and a.product_id = ${productId}
+ order by a.CREATE_DATE
+ </select>
+ <select id="getListByPhaseId" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel">
+ SELECT
+ a.*
+ FROM
+ task_phase_model a
+ where a.is_delete = 0
+ and a.phase_id=#{phaseId}
</select>
</mapper>
--
Gitblit v1.9.1