From f94a4ed8e9f5400e73bad84be023096585cb0498 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 27 十二月 2024 13:10:46 +0800
Subject: [PATCH] 代码修改
---
01-api/Service/IStation.Service/07-helper/02-schedule/ScheduleHelper.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/01-api/Service/IStation.Service/07-helper/02-schedule/ScheduleHelper.cs b/01-api/Service/IStation.Service/07-helper/02-schedule/ScheduleHelper.cs
index 715c65d..518304b 100644
--- a/01-api/Service/IStation.Service/07-helper/02-schedule/ScheduleHelper.cs
+++ b/01-api/Service/IStation.Service/07-helper/02-schedule/ScheduleHelper.cs
@@ -225,11 +225,17 @@
{
flag_cumulative_runtime_loss_ratio_dict = GetFlagCumulativeRuntimeLossRatioDict(flag_cumulative_runtime_dict);
}
- #endregion
+ #endregion
#region 瀛樺湪-浼樺厛寮�娉靛垪琛�
+ var priority_open_flag_list_remark = string.Empty;
var exist_priority_open_flag_list = priority_open_flag_list != null && priority_open_flag_list.Count > 0;
+ if (exist_priority_open_flag_list)
+ {
+ priority_open_flag_list = priority_open_flag_list.OrderBy(x => x).ToList();
+ priority_open_flag_list_remark = IntListHelper.ToString(priority_open_flag_list);
+ }
#endregion
@@ -420,13 +426,18 @@
//浼樺厛寮�娉靛垪琛�
if (exist_priority_open_flag_list)
{
- foreach (var flag in priority_open_flag_list)
- {
- if (combine.Contains(flag))
- {
- combine_merit_ratio *= 1.05;
- }
- }
+ //foreach (var flag in priority_open_flag_list)
+ //{
+ // if (combine.Contains(flag))
+ // {
+ // combine_merit_ratio *= 1.05;
+ // }
+ //}
+
+ //鐩墠閫昏緫 浼樺厛寮�娉�==蹇呭紑鏂规
+ var combine_remark = IntListHelper.ToString(combine.OrderBy(x => x));
+ if (!combine_remark.Contains(priority_open_flag_list_remark))
+ continue;
}
#endregion
--
Gitblit v1.9.3