From c339e592f9232e460602093cb3248adf2484eebb Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 29 六月 2020 12:31:30 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Converters.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Bro.M071.Process/M071Converters.cs b/src/Bro.M071.Process/M071Converters.cs
index da87fd1..fb8274b 100644
--- a/src/Bro.M071.Process/M071Converters.cs
+++ b/src/Bro.M071.Process/M071Converters.cs
@@ -49,10 +49,10 @@
if (iConfig is M071Config config)
{
- config.SnapshotPointCollection.ForEach(s =>
- {
- table[s.Id] = s.Name;
- });
+ config.SnapshotPointCollection.Where(u => u.IsEnabled).ToList().ForEach(s =>
+ {
+ table[s.Id] = s.Name;
+ });
}
}
@@ -141,7 +141,7 @@
if (iConfig is M071Config config)
{
- var resultIds = config.KeyUnitCollection.Where(u => u.Key == (context.Instance as KeyUnitBind).Key).Select(u => u.KeyResult).ToList();
+ var resultIds = config.KeyUnitCollection.Where(u => u.IsEnabled && u.Key == (context.Instance as KeyUnitBind).Key).Select(u => u.KeyResultId).ToList();
var result = config.KeyResultCollection.Where(u => resultIds.Contains(u.Id)).SelectMany(u => u.Results).ToList();
@@ -149,10 +149,10 @@
{
result.ForEach(r =>
{
- table[r] = r;
+ table.Add(r, r);
});
- table[""] = "";
+ table.Add("All", "All");
}
}
}
@@ -181,7 +181,7 @@
if (iConfig is M071Config config)
{
- return new StandardValuesCollection(config.MeasureSpecCollection.Select(u => u.Code).ToList());
+ return new StandardValuesCollection(config.MeasureTypeCollection.Select(u => u.Code).ToList());
}
}
--
Gitblit v1.8.0