优化

Src/Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2024.9240")]
-[assembly: AssemblyFileVersion("5.4.2024.9240")]
+[assembly: AssemblyVersion("5.4.2024.9250")]
+[assembly: AssemblyFileVersion("5.4.2024.9250")]
 

Src/RestfulTimeliness.cs

@@ -170,6 +170,7 @@ namespace Jst.Lims.Timeliness
                 if (PolicyNodeKvids.IsNullOrEmpty()) queryTimeline.And<Timeline>(o => o.PreKvid == Guid.Empty && o.RootKvid == o.Kvid);//不指定节点，就查根节点
                 else queryTimeline.And<Timeline>(o => Sql.In(o.PolicyNodeKvid, PolicyNodeKvids) && o.PreKvid != Guid.Empty);//指定节点，不能包含根节点
                 queryTimeline.And(o => Sql.In(o.BizKvid, queryBizKvid));
+                queryTimeline.Select(o => new { o.BizId, o.BizKvid, o.BizType, o.OperatorName, o.OperatorKvid, o.OwnerKvid, o.OwnerName, o.Title, o.RealFinishTime, o.RealStartTime, o.PlanFinishTime, o.PlanStartTime, o.RootKvid, o.ParentKvid, o.Kvid, o.Type, o.Summary });
                 timelines = conn.Select(queryTimeline);
                 if (timelines.IsNullOrEmpty()) return rtns;
                 //Console.WriteLine($"---------------timelines:{timelines.Count}--------------------");
@@ -397,7 +398,7 @@ namespace Jst.Lims.Timeliness
                 else if (rtn.Title == "羽绒组") rtn.SortId = 10;
                 else rtn.SortId = 99;
             }
-            rtns.Results = rtns.Results.OrderBy(o => o.SortId).ToList();
+            rtns.Results = rtns.Results.OrderBy(o => o.SortId).ThenBy(o => o.ReportDealDate).ToList();
             rtns.Total = rtns.Results.Count;
             cache.Set(cacheKey, rtns, TimeSpan.FromMinutes(20));
             return rtns;