From cb356c816a56a633974b71927239592df6b9c8b1 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 29 十月 2024 08:57:47 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
index 2aa391c..7544e90 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
@@ -27,18 +27,19 @@
     <select id="getChildren" resultType="com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto">
         select *
         from (
-                 SELECT f.id, f.name, 0 as sort
+                 SELECT f.id, f.name, 0 as sort, 1 as sameSbNum
                  FROM product_model f
                  WHERE f.id = ${productId}
                    AND f.is_delete = 0
                  union
-                 SELECT f.id, f.name, f.sort
+                 SELECT f.id, f.name, f.sort, g.basic_unit_num as sameSbNum
                  FROM `task_phase` a,
                       task_phase_model b,
                       operat_condit c,
                       operat_condit_model d,
                       model_rbd_node e,
-                      product_model f
+                      product_model f,
+                      param_data g
                  WHERE a.task_id = ${taskId}
                    and d.product_id = ${productId}
                    AND a.is_delete = 0
@@ -51,6 +52,8 @@
                    AND e.is_delete = 0
                    AND f.id = e.node_id
                    AND f.is_delete = 0
+                   AND g.product_id = f.id
+                   AND g.is_delete = 0
                  GROUP BY f.id, f.name, f.sort
              ) as f
         ORDER BY f.sort
@@ -230,4 +233,15 @@
           and vote_num is not null
         limit 1
     </select>
+
+    <select id="getProcessList" resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess">
+        select *
+        from simulat_assess
+        where IS_DELETE = 0
+          and pid is not null
+        <if test="isAlive">
+          and process_is_alive=1
+        </if>
+        order by process_start_time desc
+    </select>
 </mapper>

--
Gitblit v1.9.1