From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml b/modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml
index 572c271..a81cd95 100644
--- a/modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/baseReliability/ParamDataBasicDao.xml
@@ -30,7 +30,7 @@
a.basic_mtbf_regulate_tmp
WHEN a.reliab_distrib_type = 3 THEN
a.basic_unit_num * a.basic_mtbf_operating_ratio /
- a.basic_mtbf_regul_succ_rate
+ 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
@@ -79,11 +79,13 @@
SET repair_mttcr = 0
where b.ship_id = ${shipId}
and repair_mttcr is null;
+
UPDATE param_data a, product_model b
SET basic_mtbf_regulate_tmp = basic_mtbf_regulate
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>
@@ -92,12 +94,56 @@
UPDATE param_data a, product_model b
SET basic_mtbf_regulate = basic_mtbf_regulate_tmp
where b.ship_id = ${shipId}
- and (reliab_distrib_type = 1 or reliab_distrib_type is null);
+ and (reliab_distrib_type = 1 or reliab_distrib_type is null)
+ and a.product_id = b.id
+ and a.IS_DELETE = 0
+ and b.IS_DELETE = 0;
UPDATE param_data a, product_model b
SET ai = basic_mtbf_regulate_tmp / (basic_mtbf_regulate_tmp + repair_mttcr)
where b.ship_id = ${shipId}
+ and a.product_id = b.id
+ and a.IS_DELETE = 0
+ and b.IS_DELETE = 0;
+ UPDATE param_data a,(
+ select pid, case when count(1) > 0 then 1 else 0 end as basic_join_compute
+ from param_data a,
+ product_model b
+ where b.ship_id = ${shipId}
+ and a.product_id = b.id
+ and a.basic_join_compute = 1
+ and b.product_type = 5
+ group by b.pid
+ ) b
+ set a.basic_join_compute = b.basic_join_compute
+ where a.product_id = b.pid;
+
+ UPDATE param_data a,(
+ select pid, case when count(1) > 0 then 1 else 0 end as basic_join_compute
+ from param_data a,
+ product_model b
+ where b.ship_id = ${shipId}
+ and a.product_id = b.id
+ and a.basic_join_compute = 1
+ and b.product_type = 4
+ group by b.pid
+ ) b
+ set a.basic_join_compute = b.basic_join_compute
+ where a.product_id = b.pid;
+
+ UPDATE param_data a,(
+ select pid, case when count(1) > 0 then 1 else 0 end as basic_join_compute
+ from param_data a,
+ product_model b
+ where b.ship_id = ${shipId}
+ and a.product_id = b.id
+ and a.basic_join_compute = 1
+ and b.product_type = 3
+ group by b.pid
+ ) b
+ set a.basic_join_compute = b.basic_join_compute
+ where a.product_id = b.pid;
</update>
<select id="getAI" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
@@ -109,11 +155,13 @@
b.repair_mttcr,
b.basic_mtbf_operating_ratio,
b.basic_mtbf_regul_succ_rate,
- b.basic_runs_num
+ b.basic_runs_num,
+ b.basic_unit_num
FROM product_model a
LEFT JOIN param_data b ON b.product_id = a.id and b.is_delete = 0
where a.is_delete = 0
and a.product_type <> 10
+ and b.basic_join_compute = 1
and a.ship_id = ${shipId}
or a.id = ${shipId}
ORDER BY a.product_type, a.sort
--
Gitblit v1.9.1