From a86c2eb2db34d2d350e5c2eb72bf6416ec89c0d2 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 19 十一月 2024 11:43:03 +0800
Subject: [PATCH] 1)可靠性评定时新增模型检查处理; 2)获取任务二项分布参数时,去掉模型的匹配。

---
 modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
index 67e8be8..4e2475b 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelRbdDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelRbdDao">
 
-    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
-        select a.*
+    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+        select a.*,
+        CASE
+        WHEN b.end =1 THEN '宸插畬鎴�'
+        WHEN a.content is not null THEN '姝e湪缂栬緫'
+        ELSE '鏈紪杈�' END AS modelState,
+        d.num as quoteNum
         from model_rbd a
+        left join (select model_id,1 as end from algorithm where model_type = 'end' and is_delete=0 ) b on b.model_id =
+        a.id
+        left join (select model_id,count(1) as num from operat_condit_model where is_delete=0 group by model_id ) d on
+        d.model_id = a.id
         <where>
             a.is_delete = 0
             <if test="productId!=null and productId!=''">
@@ -15,11 +24,8 @@
                 and ${whereSql}
             </if>
         </where>
-        <if test="orderBySql!=null">
-            ORDER BY ${orderBySql}
-        </if>
     </select>
-    <select id="getDiagram" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
+    <select id="getDiagram" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
         select a.*
         from model_rbd a
         <where>
@@ -28,6 +34,25 @@
         </where>
         limit 1
     </select>
+    <select id="getDiagramOfXDY" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+        select a.*
+        from model_rbd a
+        <where>
+            a.is_delete = 0
+            and a.product_id =${productId}
+        </where>
+        limit 1
+    </select>
+    <select id="getListAll" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+        select a.*,
+        CASE
+        WHEN b.end =1 THEN '宸插畬鎴�'
+        ELSE '鏈畬鎴�' END AS modelState
+        from model_rbd a
+        left join (select model_id,1 as end from algorithm where model_type = 'end' and is_delete=0 ) b on b.model_id = a.id
+        where
+            a.is_delete = 0
+    </select>
 
     <update id="deleteByModelId">
         delete

--
Gitblit v1.9.1