From 0d2203b4027ae3bf524d63da67202e778648e4cf Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 02 八月 2024 09:59:20 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml | 114 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 29 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
index 81f5f6a..6112800 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
@@ -4,12 +4,12 @@
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.SimulatAssessDao">
<select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess">
- select *
+ select id, CONCAT_WS(' ', name, CREATE_DATE) AS name
from simulat_assess
where product_id = ${productId}
and task_model_id = ${taskModelId}
and IS_DELETE = 0
- order by name desc
+ order by CREATE_DATE desc
</select>
<select id="getNumById" resultType="java.lang.Integer">
select COUNT(*)
@@ -26,33 +26,89 @@
and a.IS_DELETE = 0
</select>
<select id="getChildren" resultType="com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto">
- select * from (
- SELECT f.id,f.name, 0 as sort
- FROM product_model f
- WHERE f.id = 1813102074724945921
- AND f.is_delete = 0
- union
- SELECT f.id,f.name,f.sort
- FROM `task_phase` a,
- task_phase_model b,
- operat_condit c,
- operat_condit_model d,
- model_rbd_node e,
- product_model f
- WHERE a.task_id = ${taskId}
- and d.product_id = ${productId}
- AND a.is_delete = 0
- AND b.is_delete = 0
- AND c.id = b.operat_condit_id
- AND c.is_delete = 0
- AND d.operat_condit_id = c.id
- AND d.is_delete = 0
- AND e.model_id = d.model_id
- AND e.is_delete = 0
- AND f.id = e.node_id
- AND f.is_delete = 0
- GROUP BY f.id,f.name,f.sort
- ) as f
+ select *
+ from (
+ SELECT f.id, f.name, 0 as sort
+ FROM product_model f
+ WHERE f.id = ${productId}
+ AND f.is_delete = 0
+ union
+ SELECT f.id, f.name, f.sort
+ FROM `task_phase` a,
+ task_phase_model b,
+ operat_condit c,
+ operat_condit_model d,
+ model_rbd_node e,
+ product_model f
+ WHERE a.task_id = ${taskId}
+ and d.product_id = ${productId}
+ AND a.is_delete = 0
+ AND b.is_delete = 0
+ AND c.id = b.operat_condit_id
+ AND c.is_delete = 0
+ AND d.operat_condit_id = c.id
+ AND d.is_delete = 0
+ AND e.model_id = d.model_id
+ AND e.is_delete = 0
+ AND f.id = e.node_id
+ AND f.is_delete = 0
+ GROUP BY f.id, f.name, f.sort
+ ) as f
ORDER BY f.sort
</select>
+ <select id="getTaskPhaseModelByTaskId"
+ resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel">
+ select *
+ from simulat_assess_task_phase_model
+ where is_delete = 0
+ and task_id = ${taskId}
+ order by sort
+ </select>
+ <select id="getTimeDiagram" resultType="com.zt.life.modules.mainPart.taskReliability.model.TimeDiagram">
+ select *
+ from time_diagram
+ where is_delete = 0
+ <if test="projectId!=null and projectId!=''">
+ and PROJECT_ID = #{projectId}
+ </if>
+ <if test="diagramId!=null and diagramId!=''">
+ and DIAGRAM_ID = #{diagramId}
+ </if>
+ <if test="hasPublish!=null and hasPublish!=''">
+ and HAS_PUBLISH = #{hasPublish}
+ </if>
+ </select>
+ <select id="getModelListOld" resultType="com.zt.life.modules.mainPart.taskReliability.dto.ModelDto">
+ SELECT a.id AS phase_id,
+ a.phase_name,
+ a.phase_duration_rate,
+ b.operat_condit_duration_rate,
+ b.operat_condit_id,
+ c.NAME AS operat_condit_name,
+ d.model_id,
+ e.model_name
+ FROM `task_phase` a,
+ task_phase_model b,
+ operat_condit c,
+ operat_condit_model d,
+ model_rbd e
+ WHERE a.task_id = ${taskId}
+ and d.product_id = ${productId}
+ AND a.is_delete = 0
+ AND b.is_delete = 0
+ AND c.id = b.operat_condit_id
+ AND c.is_delete = 0
+ AND d.operat_condit_id = c.id
+ AND d.is_delete = 0
+ and e.is_delete = 0
+ 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 *
+ FROM simulat_assess_task_phase_model
+ WHERE fz_id = ${fzId}
+ AND is_delete = 0
+ order by sort
+ </select>
</mapper>
--
Gitblit v1.9.1