src/Hotline.Application/StatisticalReport/OrderReportApplication.cs

@@ -532,7 +532,7 @@ order by ""su"".""OrgCode""";
                         .WhereIF(dto.OrgCode == "001", x => x.ApplyOrgCode == dto.OrgCode)
                         .WhereIF(dto.OrgCode != "001", x => x.ApplyOrgCode.StartsWith(dto.OrgCode))
                         .OrderByDescending(x => x.Order.CreationTime)
-                        .Select(x => new SelectOrderId { Id = x.Order.Id })
+                        .Select(x => new SelectOrderId { Id = x.OrderId })
                        .MergeTable();
                     break;
                 case EStatisticsType.YBOverdue://已办超期
@@ -682,7 +682,7 @@ order by ""su"".""OrgCode""";
                        .WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, x => x.Order.Source == ESource.ProvinceStraight)
                        .WhereIF(dto.OrgCode == "001", x => x.CreatorOrgId == dto.OrgCode)
                        .WhereIF(dto.OrgCode != "001", x => x.CreatorOrgId.StartsWith(dto.OrgCode))
-                        .Select(x => new SelectOrderId { Id = x.Order.Id })
+                        .Select(x => new SelectOrderId { Id = x.OrderId})
                        .MergeTable();
                     break;
                 case EStatisticsType.ScreenApproval://带甄别
@@ -693,7 +693,7 @@ order by ""su"".""OrgCode""";
                        .WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, x => x.Order.Source == ESource.ProvinceStraight)
                        .WhereIF(dto.OrgCode == "001", x => x.CreatorOrgId == dto.OrgCode)
                        .WhereIF(dto.OrgCode != "001", x => x.CreatorOrgId.StartsWith(dto.OrgCode))
-                        .Select(x => new SelectOrderId { Id = x.Order.Id })
+                        .Select(x => new SelectOrderId { Id = x.OrderId})
                        .MergeTable();
                     break;
                 case EStatisticsType.ScreenPass://甄别通过
@@ -703,7 +703,7 @@ order by ""su"".""OrgCode""";
                        .WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, x => x.Order.Source == ESource.ProvinceStraight)
                        .WhereIF(dto.OrgCode == "001", x => x.CreatorOrgId == dto.OrgCode)
                        .WhereIF(dto.OrgCode != "001", x => x.CreatorOrgId.StartsWith(dto.OrgCode))
-                        .Select(x => new SelectOrderId { Id = x.Order.Id })
+                        .Select(x => new SelectOrderId { Id = x.OrderId })
                        .MergeTable();
                     break;
                 case EStatisticsType.ScreenNotPass://甄别不通过
@@ -713,7 +713,7 @@ order by ""su"".""OrgCode""";
                       .WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, x => x.Order.Source == ESource.ProvinceStraight)
                       .WhereIF(dto.OrgCode == "001", x => x.CreatorOrgId == dto.OrgCode)
                       .WhereIF(dto.OrgCode != "001", x => x.CreatorOrgId.StartsWith(dto.OrgCode))
-                       .Select(x => new SelectOrderId { Id = x.Order.Id })
+                       .Select(x => new SelectOrderId { Id = x.OrderId})
                       .MergeTable();
                     break;
                 default: