Commit 9b32e4cf by Neo Turing

升级

parent 9091c0e4
......@@ -32,6 +32,6 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2024.4280")]
[assembly: AssemblyFileVersion("5.4.2024.4280")]
[assembly: AssemblyVersion("5.4.2024.5280")]
[assembly: AssemblyFileVersion("5.4.2024.5280")]
......@@ -188,6 +188,7 @@ namespace Jst.Lims.Timeliness
if (item.PlanFinishTime != null && realFinishTime > item.PlanFinishTime) total.TimeoutQuantity++;
else total.NormalQuantity++;
if (filterTime != null && item.RealFinishTime != null && item.RealFinishTime <= filterTime) total.TimeFilterQuantity++;
else item.TimeoutQuantity = 1;
}
total.Details = kv.ToList();
rtns.Results.Add(total);
......@@ -241,6 +242,7 @@ namespace Jst.Lims.Timeliness
if (item.PlanFinishTime != null && realFinishTime > item.PlanFinishTime) total.TimeoutQuantity++;
else total.NormalQuantity++;
if (filterTime != null && item.RealFinishTime != null && item.RealFinishTime <= filterTime) total.TimeFilterQuantity++;
else item.TimeoutQuantity = 1;
}
total.Details = kv.ToList();
rtns.Results.Add(total);
......
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