Commit a94c721a by Neo Turing

优化

parent 2e63e37c
...@@ -32,6 +32,6 @@ using System.Runtime.InteropServices; ...@@ -32,6 +32,6 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2024.9250")] [assembly: AssemblyVersion("5.4.2025.4280")]
[assembly: AssemblyFileVersion("5.4.2024.9250")] [assembly: AssemblyFileVersion("5.4.2025.4280")]
...@@ -209,6 +209,9 @@ namespace Jst.Lims.Timeliness ...@@ -209,6 +209,9 @@ namespace Jst.Lims.Timeliness
case TimeFilter.SixPM: case TimeFilter.SixPM:
filterTime = DateTime.Parse(kv.Key.Value.ToString("yyyy-MM-dd 18:00:00")); filterTime = DateTime.Parse(kv.Key.Value.ToString("yyyy-MM-dd 18:00:00"));
break; break;
case TimeFilter.TwelvePM:
filterTime = DateTime.Parse(kv.Key.Value.ToString("yyyy-MM-dd 23:59:59"));
break;
default: default:
filterTime = null; filterTime = null;
break; break;
...@@ -310,6 +313,9 @@ namespace Jst.Lims.Timeliness ...@@ -310,6 +313,9 @@ namespace Jst.Lims.Timeliness
case TimeFilter.SixPM: case TimeFilter.SixPM:
filterTime = DateTime.Parse(kv.Key.DeadDate.Value.ToString("yyyy-MM-dd 18:00:00")); filterTime = DateTime.Parse(kv.Key.DeadDate.Value.ToString("yyyy-MM-dd 18:00:00"));
break; break;
case TimeFilter.TwelvePM:
filterTime = DateTime.Parse(kv.Key.DeadDate.Value.ToString("yyyy-MM-dd 23:59:59"));
break;
default: default:
filterTime = null; filterTime = null;
break; break;
...@@ -586,9 +592,9 @@ namespace Jst.Lims.Timeliness ...@@ -586,9 +592,9 @@ namespace Jst.Lims.Timeliness
total.TimeFilter = TimeFilter; total.TimeFilter = TimeFilter;
total.Details = new List<TimelineStatistic>(); total.Details = new List<TimelineStatistic>();
foreach (var item in kv) foreach (var item in kv)
{ {
var realFinishTime = item.RealFinishTime; var realFinishTime = item.RealFinishTime;
if (realFinishTime == null) realFinishTime = DateTime.Now; if (realFinishTime == null) realFinishTime = DateTime.Now;
//if (item.PlanFinishTime != item.ReportDeadDate.Value.AddDays(1).AddSeconds(-1)) item.PlanFinishTime = item.ReportDeadDate.Value.AddDays(1).AddSeconds(-1); //if (item.PlanFinishTime != item.ReportDeadDate.Value.AddDays(1).AddSeconds(-1)) item.PlanFinishTime = item.ReportDeadDate.Value.AddDays(1).AddSeconds(-1);
if (item.PlanFinishTime != null && realFinishTime > item.PlanFinishTime) total.TimeoutQuantity++; if (item.PlanFinishTime != null && realFinishTime > item.PlanFinishTime) total.TimeoutQuantity++;
else total.NormalQuantity++; else total.NormalQuantity++;
...@@ -814,6 +820,11 @@ namespace Jst.Lims.Timeliness ...@@ -814,6 +820,11 @@ namespace Jst.Lims.Timeliness
/// <summary> /// <summary>
/// 18:00 /// 18:00
/// </summary> /// </summary>
SixPM SixPM,
/// <summary>
/// 24:00
/// </summary>
TwelvePM
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment