From 112f6bf8aa6c76b055d19627ccef21fb59515436 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 17 十一月 2022 16:56:57 +0800
Subject: [PATCH] eta 修改业务单位能耗计算方法，用了平均权重计算
---
Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic金泽系统.cs | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git "a/Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic\351\207\221\346\263\275\347\263\273\347\273\237.cs" "b/Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic\351\207\221\346\263\275\347\263\273\347\273\237.cs"
index e7abbda..a329baa 100644
--- "a/Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic\351\207\221\346\263\275\347\263\273\347\273\237.cs"
+++ "b/Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic\351\207\221\346\263\275\347\263\273\347\273\237.cs"
@@ -68,7 +68,8 @@
anaResult.Qa = jzqsLogicResult.Qa;
anaResult.Pa = jzqsLogicResult.Pa + jzqsResult.Pa;
- anaResult.Ha = jzqsLogicResult.Ha;
+ //anaResult.Ha = jzqsLogicResult.Ha;
+ anaResult.Ha = jzqsLogicResult.Ha??0 + jzqsResult.Ha??0;
double qaTotal = child_ana_records.Where(x => x.Ea.HasValue && x.Ea.Value > 10).Sum(x => x.Qa.Value);
@@ -91,26 +92,17 @@
wpa += item.WPa.Value * item.Qa.Value / qaTotal;
}
}
-
+
double uwpa = 0;
+ var jzltgLogicChildResult = this.jzltgLogicAnaInfoBundle.ChildStationBundleList.Select(x => x.AnaResult);
+ var uwpaSum = jzltgLogicChildResult.Sum(x => (x.UWPa ?? 0) * (x.Qa ?? 0));
+ uwpaSum += (jzqsResult.UWPa ?? 0) * (jzqsResult.Qa ?? 0);
- if (anaResult.Pa != null)
- {
- if (!child_ana_records.Exists(x => !x.Ha.HasValue))
- {
- var haTatol = child_ana_records.Sum(x => x.Ha.Value);
- uwpa = anaResult.Pa.Value / qaTotal / haTatol * 1000;
- }
- else
- {
- anaResult.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Ha, null);
- }
- }
- else
- {
- anaResult.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Pa, null);
- }
+ var qSum = jzltgLogicChildResult.Sum(x => x.Qa ?? 0);
+ qSum += jzqsResult.Qa ?? 0;
+
+ uwpa = uwpaSum / qSum;
anaResult.Ea = Math.Round(eta, 1);
--
Gitblit v1.9.3