From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml b/modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml
index feda90c..a81cd95 100644
--- a/modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml
@@ -29,8 +29,8 @@
                                                     a.basic_unit_num * a.basic_mtbf_operating_ratio /
                                                     a.basic_mtbf_regulate_tmp
                                             WHEN a.reliab_distrib_type = 3 THEN
-                                                    a.basic_unit_num * a.basic_mtbf_operating_ratio *(1-basic_mtbf_regul_succ_rate)/
-                                                    a.basic_mtbf_regul_succ_rate
+                                                    a.basic_unit_num * a.basic_mtbf_operating_ratio /
+                                                    a.basic_mtbf_regulate_tmp
                                             ELSE 0 END
                                     ) AS WeightedFailure,
                                 sum(
@@ -42,7 +42,7 @@
                                                     a.basic_mtbf_regulate_tmp
                                             WHEN a.repairable = 1 and a.reliab_distrib_type = 3 THEN
                                                     a.basic_unit_num * a.basic_mtbf_operating_ratio * a.repair_mttcr /
-                                                    a.basic_mtbf_regul_succ_rate
+                                                    a.basic_mtbf_regulate_tmp
                                             ELSE 0
                                             END
                                     ) AS WeightedMttr
@@ -85,7 +85,7 @@
         where b.ship_id = ${shipId};
 
         UPDATE param_data a, product_model b
-        SET basic_mtbf_regulate_tmp = basic_runs_num / basic_mtbf_regul_succ_rate
+        SET basic_mtbf_regulate_tmp = basic_mtbf_regul_succ_rate/(1-basic_mtbf_regul_succ_rate)
         where b.ship_id = ${shipId}
           and reliab_distrib_type = 3
     </update>

--
Gitblit v1.9.1