Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Application/OrderApp/OrderAnalysisApplication.cs

@@ -139,7 +139,7 @@ namespace Hotline.Application.OrderApp
             var orders = await _orderAnalysisRepository.Queryable()
                 .LeftJoin<Order>((a, o) => a.AcceptTypeCode == o.AcceptTypeCode && a.HotspotId == o.HotspotId && o.AreaCode.StartsWith(a.AreaCode))
                 .Where((a, o) => a.AnalysisId == dto.AnalysisId)
-                .Where((a, o) => o.CreationTime >= a.StartTime && o.CreationTime <= a.StartTime)
+                .Where((a, o) => o.CreationTime >= a.StartTime && o.CreationTime <= a.EndTime)
                  .Where((a, o) => filterTitle.Any(s => o.Title.Contains(s)) == false)
                 .Select((a, o) => o).ToListAsync(cancellationToken);
             var introductionData = orders.GroupBy(x => x.SourceChannel)

src/Hotline.Application/Snapshot/SnapshotOrderApplication.cs

@@ -217,7 +217,7 @@ public class SnapshotOrderApplication : IOrderSnapshotApplication, IScopeDepende
             .Where((snapshot, order, step) => snapshot.IndustryName == "安全隐患")
             //.WhereIF(dto.Status == 0, (snapshot, order, step) => step.Tag == TagDefaults.OrderMark) // 全部
             .WhereIF(dto.Status == 1, (snapshot, order, step) => step.Tag == TagDefaults.OrderMark && step.Status != EWorkflowStepStatus.Handled &&  _sessionContext.Roles.Contains(step.RoleId)) // 待标记
-            .WhereIF(dto.Status == 2, (snapshot, order, step) => step.Tag == TagDefaults.OrderMark && step.Status == EWorkflowStepStatus.Handled) // 已标记
+            .WhereIF(dto.Status == 2, (snapshot, order, step) => snapshot.IsSafetyDepartment != null) // 已标记
             .WhereIF(dto.No.NotNullOrEmpty(), (snapshot, order, step) => order.No.Contains(dto.No))
             .WhereIF(dto.Title.NotNullOrEmpty(), (snapshot, order, step) => order.Title.Contains(dto.Title))
             .OrderByDescending((snapshot, order, step) => snapshot.CreationTime)