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

src/Hotline.Api/Controllers/AiController.cs

@@ -971,7 +971,7 @@ namespace Hotline.Api.Controllers
 
             var aiOrderVisitDtos = _mapper.Map<ICollection<AiOrderVisitDto>>(aiOrderVisits);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<AiOrderVisitDto>(dto.ColumnInfos);
 
             var dtos = aiOrderVisitDtos
                 .Select(stu => _mapper.Map(stu, typeof(AiOrderVisitDto), dynamicClass))
@@ -1016,7 +1016,7 @@ namespace Hotline.Api.Controllers
 
             var aiOrderVisitDetailDtos = _mapper.Map<ICollection<AiOrderVisitDetailDto>>(aiOrderVisits);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<AiOrderVisitDetailDto>(dto.ColumnInfos);
 
             var dtos = aiOrderVisitDetailDtos
                 .Select(stu => _mapper.Map(stu, typeof(AiOrderVisitDetailDto), dynamicClass))

src/Hotline.Api/Controllers/Bi/BiCallController.cs

@@ -266,7 +266,7 @@ public class BiCallController : BaseController
     {
         var (total, data) = await _callReportApplication.QueryCallsDetailInTotalAsync(dto.QueryDto, dto.IsExportAll);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<CallRecordOutDto>(dto.ColumnInfos);
 
         var dtos = data
             .Select(stu => _mapper.Map(stu, typeof(CallRecordOutDto), dynamicClass))
@@ -788,7 +788,7 @@ public class BiCallController : BaseController
 
         var dataDtos = _mapper.Map<ICollection<QuerySeatMonthCallDetailResp>>(data);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<QuerySeatMonthCallDetailResp>(dto.ColumnInfos);
 
         var dtos = dataDtos
             .Select(stu => _mapper.Map(stu, typeof(QuerySeatMonthCallDetailResp), dynamicClass))

src/Hotline.Api/Controllers/Bi/BiKnowledgeController.cs

@@ -105,7 +105,7 @@ namespace Hotline.Api.Controllers.Bi
 				PassNum = data.Select(x => x.PassNum).Sum(),
 				PublicNum = data.Select(x => x.PublicNum).Sum(),
 			});
-			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<KnowledgeBiDataListVo>(dto.ColumnInfos);
 
 			var dtos = data
 				.Select(stu => _mapper.Map(stu, typeof(KnowledgeBiDataListVo), dynamicClass))

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -249,7 +249,7 @@ namespace Hotline.Api.Controllers.Bi
                 });
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<PublishedOrderStatisticsDto>(dto.ColumnInfos);
 
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(PublishedOrderStatisticsDto), dynamicClass))
@@ -369,7 +369,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var dataDtos = _mapper.Map<ICollection<OrderDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -416,7 +416,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var dataDtos = _mapper.Map<ICollection<OrderDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -481,7 +481,7 @@ namespace Hotline.Api.Controllers.Bi
                 NoHandlerExtendedNum = data.Select(s => s.NoHandlerExtendedNum).Sum(),
                 CounterNoHandlerExtendedNum = data.Select(s => s.CounterNoHandlerExtendedNum).Sum(),
             });
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderBiOrgDataListVo>(dto.ColumnInfos);
             var dtos = data
              .Select(stu => _mapper.Map(stu, typeof(OrderBiOrgDataListVo), dynamicClass))
              .Cast<object>()
@@ -525,7 +525,7 @@ namespace Hotline.Api.Controllers.Bi
                 Repeat = data.Select(s => s.Repeat).Sum(),
                 Subtotal = data.Select(s => s.Subtotal).Sum()
             });
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderBiCentreDataListVo>(dto.ColumnInfos);
             var dtos = data
              .Select(stu => _mapper.Map(stu, typeof(OrderBiCentreDataListVo), dynamicClass))
              .Cast<object>()
@@ -665,7 +665,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var dataDtos = _mapper.Map<ICollection<HotspotDataLsitVo>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<HotspotDataLsitVo>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(HotspotDataLsitVo), dynamicClass))
@@ -853,7 +853,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var dataDtos = _mapper.Map<ICollection<OrderVisitDetailDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderVisitDetailDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderVisitDetailDto), dynamicClass))
@@ -910,7 +910,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<BiOrderDelayDataDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<BiOrderDelayDataDto>(dto.ColumnInfos);
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(BiOrderDelayDataDto), dynamicClass))
                 .Cast<object>()
@@ -956,7 +956,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<OrderDelayDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDelayDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDelayDto), dynamicClass))
@@ -1032,7 +1032,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<OrderDelayDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDelayDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDelayDto), dynamicClass))
@@ -1204,7 +1204,7 @@ namespace Hotline.Api.Controllers.Bi
                 data = items;
             }
             var orderDtos = _mapper.Map<IReadOnlyList<OrderDto>>(data);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -1247,7 +1247,7 @@ namespace Hotline.Api.Controllers.Bi
                 SumCount = list.Sum(x => x.SumCount)
             };
             list.Add(SumModel);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<VisitMeasureStatisticsModelDto>(dto.ColumnInfos);
             var dtos = list
              .Select(stu => _mapper.Map(stu, typeof(VisitMeasureStatisticsModelDto), dynamicClass))
              .Cast<object>()
@@ -1486,7 +1486,7 @@ namespace Hotline.Api.Controllers.Bi
                 data = items;
             }
             var orderDtos = _mapper.Map<IReadOnlyList<OrderDto>>(data);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -1542,7 +1542,7 @@ namespace Hotline.Api.Controllers.Bi
                 data = items;
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SeatSatisfactionStatisticsDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(SeatSatisfactionStatisticsDto), dynamicClass))
@@ -1639,7 +1639,7 @@ namespace Hotline.Api.Controllers.Bi
             };
             data.Add(sumModel);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SeatSatisfactionStatisticsListDetailDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(SeatSatisfactionStatisticsListDetailDto), dynamicClass))
@@ -1708,7 +1708,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<OrderVisitDetailDto>>(orders);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderVisitDetailDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderVisitDetailDto), dynamicClass))
@@ -1834,7 +1834,7 @@ namespace Hotline.Api.Controllers.Bi
             data.Add(countySumModel);
             data.Add(citySumModel);
             data.Add(sumModel);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<VisitAndOrgSatisfactionStatisticsDto>(dto.ColumnInfos);
             var dtos = data
              .Select(stu => _mapper.Map(stu, typeof(VisitAndOrgSatisfactionStatisticsDto), dynamicClass))
              .Cast<object>()
@@ -1956,7 +1956,7 @@ namespace Hotline.Api.Controllers.Bi
             list.Add(countySumModel);
             list.Add(citySumModel);
             list.Add(sumModel);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<VisitAndOrgSatisfactionStatisticsDto>(dto.ColumnInfos);
             var dtos = list
              .Select(stu => _mapper.Map(stu, typeof(VisitAndOrgSatisfactionStatisticsDto), dynamicClass))
              .Cast<object>()
@@ -2002,7 +2002,7 @@ namespace Hotline.Api.Controllers.Bi
             }
 
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrgVisitDetailListResp>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(OrgVisitDetailListResp), dynamicClass))
@@ -3119,7 +3119,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<DepartmentAcceptanceTypeStatisticsDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<DepartmentAcceptanceTypeStatisticsDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(DepartmentAcceptanceTypeStatisticsDto), dynamicClass))
@@ -3167,7 +3167,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<OrderDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -3397,7 +3397,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<DepartmentalProcessingStatisticsDataDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<DepartmentalProcessingStatisticsDataDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(DepartmentalProcessingStatisticsDataDto), dynamicClass))
@@ -3501,7 +3501,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<DepartmentalProcessingStatisticsDataDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<DepartmentalProcessingStatisticsDataDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(DepartmentalProcessingStatisticsDataDto), dynamicClass))
@@ -3594,7 +3594,7 @@ namespace Hotline.Api.Controllers.Bi
                 }).ToList();
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -3687,7 +3687,7 @@ namespace Hotline.Api.Controllers.Bi
                 }).ToList();
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -3943,7 +3943,7 @@ namespace Hotline.Api.Controllers.Bi
                 OrgName = "合计",
                 Num = data.Select(s => s.Num).Sum(),
             });
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderReTransactVo>(dto.ColumnInfos);
             var dtos = data
              .Select(stu => _mapper.Map(stu, typeof(OrderReTransactVo), dynamicClass))
              .Cast<object>()
@@ -3989,7 +3989,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var dataDtos = _mapper.Map<ICollection<OrderSpecialDetailDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderSpecialDetailDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderSpecialDetailDto), dynamicClass))
@@ -4052,7 +4052,7 @@ namespace Hotline.Api.Controllers.Bi
                 });
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SendOrderReportOutDto>(dto.ColumnInfos);
 
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(SendOrderReportOutDto), dynamicClass))
@@ -4142,7 +4142,7 @@ namespace Hotline.Api.Controllers.Bi
             var query = _orderSecondaryHandlingApplication.SecondaryHandlingReport(dto.QueryDto, HttpContext.RequestAborted);
             List<SecondaryHandlingVo> secondaryHandling;
             secondaryHandling = await query.ToListAsync(HttpContext.RequestAborted);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SecondaryHandlingVo>(dto.ColumnInfos);
             var dtos = secondaryHandling
                 .Select(stu => _mapper.Map(stu, typeof(SecondaryHandlingVo), dynamicClass))
                 .Cast<object>()
@@ -4188,7 +4188,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var secondaryHandlingDtos = _mapper.Map<ICollection<OrderSecondaryHandlingDto>>(secondaryHandling);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderSecondaryHandlingDto>(dto.ColumnInfos);
 
             var dtos = secondaryHandlingDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderSecondaryHandlingDto), dynamicClass))
@@ -4325,7 +4325,7 @@ namespace Hotline.Api.Controllers.Bi
             };
             secondaryHandling.Add(cityTotal);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SecondaryHandlingSatisfactionVo>(dto.ColumnInfos);
             var dtos = secondaryHandling
                 .Select(stu => _mapper.Map(stu, typeof(SecondaryHandlingSatisfactionVo), dynamicClass))
                 .Cast<object>()
@@ -4371,7 +4371,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var secondaryHandlingDtos = _mapper.Map<ICollection<OrderSecondaryHandlingDto>>(secondaryHandling);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderSecondaryHandlingDto>(dto.ColumnInfos);
 
             var dtos = secondaryHandlingDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderSecondaryHandlingDto), dynamicClass))
@@ -4430,7 +4430,7 @@ namespace Hotline.Api.Controllers.Bi
                     item.WorkflowStep.CreationTime, item.WorkflowStep.Status == EWorkflowStepStatus.WaitForAccept ? DateTime.Now : item.WorkflowStep.AcceptTime!.Value, false);
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<UnsignedOrderDto>(dto.ColumnInfos);
 
             var dtos = unsignedOrderDtos
                 .Select(stu => _mapper.Map(stu, typeof(UnsignedOrderDto), dynamicClass))
@@ -4481,7 +4481,7 @@ namespace Hotline.Api.Controllers.Bi
             var count = orderSources.Sum(x => x.Num);
             orderSources.ForEach(x => x.TotalSumCount = count);
             orderSources.Add(new OrderSourceVo { Source = "合计", Num = count, TotalSumCount = count });
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderSourceVo>(dto.ColumnInfos);
             var dtos = orderSources
                 .Select(stu => _mapper.Map(stu, typeof(OrderSourceVo), dynamicClass))
                 .Cast<object>()
@@ -4554,7 +4554,7 @@ namespace Hotline.Api.Controllers.Bi
                 orders = items;
             }
             var ordersDtos = _mapper.Map<ICollection<OrderDto>>(orders);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
             var dtos = ordersDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
                 .Cast<object>()
@@ -4778,7 +4778,7 @@ namespace Hotline.Api.Controllers.Bi
                 orders = items;
             }
             //var ordersDtos = _mapper.Map<ICollection<OrgVisitDetailListResp>>(orders);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrgVisitDetailListResp>(dto.ColumnInfos);
             var dtos = orders
                 .Select(stu => _mapper.Map(stu, typeof(OrgVisitDetailListResp), dynamicClass))
                 .Cast<object>()
@@ -4861,7 +4861,7 @@ namespace Hotline.Api.Controllers.Bi
                 orders = items;
             }
             var ordersDtos = _mapper.Map<ICollection<HotspotAndAreaStatisticsDetailDto>>(orders);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<HotspotAndAreaStatisticsDetailDto>(dto.ColumnInfos);
             var dtos = ordersDtos
                 .Select(stu => _mapper.Map(stu, typeof(HotspotAndAreaStatisticsDetailDto), dynamicClass))
                 .Cast<object>()
@@ -4892,7 +4892,7 @@ namespace Hotline.Api.Controllers.Bi
                 orders = items;
             }
             var ordersDtos = _mapper.Map<ICollection<HotspotAndAreaStatisticsDetailDto>>(orders);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<HotspotAndAreaStatisticsDetailDto>(dto.ColumnInfos);
             var dtos = ordersDtos
                 .Select(stu => _mapper.Map(stu, typeof(HotspotAndAreaStatisticsDetailDto), dynamicClass))
                 .Cast<object>()
@@ -4951,7 +4951,7 @@ namespace Hotline.Api.Controllers.Bi
                 x.SumCountRate = SumCount > 0 ? Math.Round((double)x.SumCount / (double)SumCount * 100, digits: 3) + "%" : 0.000 + "%";
             });
             var orderDtos = _mapper.Map<ICollection<AcceptTypeStatisticsDto>>(list);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<AcceptTypeStatisticsDto>(dto.ColumnInfos);
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(AcceptTypeStatisticsDto), dynamicClass))
                 .Cast<object>()
@@ -5123,7 +5123,7 @@ namespace Hotline.Api.Controllers.Bi
                 NoPutThroughCount = data.Sum(x => x.NoPutThroughCount),
             };
             data.Add(sumModel);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<VisitAndHotspotSatisfactionStatisticsDto>(dto.ColumnInfos);
             var dtos = data
              .Select(stu => _mapper.Map(stu, typeof(VisitAndHotspotSatisfactionStatisticsDto), dynamicClass))
              .Cast<object>()
@@ -5169,7 +5169,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var dataDtos = _mapper.Map<ICollection<OrderVisitDetailDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderVisitDetailDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderVisitDetailDto), dynamicClass))
@@ -5242,7 +5242,7 @@ namespace Hotline.Api.Controllers.Bi
                 orders = items;
             }
             var ordersDtos = _mapper.Map<ICollection<OrderDto>>(orders);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
             var dtos = ordersDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
                 .Cast<object>()
@@ -5284,7 +5284,7 @@ namespace Hotline.Api.Controllers.Bi
                 var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
                 datas = items;
             }
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderScreenApplyVo>(dto.ColumnInfos);
             var dtos = datas
                 .Select(stu => _mapper.Map(stu, typeof(OrderScreenApplyVo), dynamicClass))
                 .Cast<object>()
@@ -5326,7 +5326,7 @@ namespace Hotline.Api.Controllers.Bi
                 var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
                 datas = items;
             }
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderScreenAuditVo>(dto.ColumnInfos);
             var dtos = datas
                 .Select(stu => _mapper.Map(stu, typeof(OrderScreenAuditVo), dynamicClass))
                 .Cast<object>()
@@ -5378,7 +5378,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<OrderNoSigenDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderNoSigenDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderNoSigenDto), dynamicClass))
@@ -5443,7 +5443,7 @@ namespace Hotline.Api.Controllers.Bi
                 }).ToList();
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -5499,7 +5499,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var orderDtos = _mapper.Map<ICollection<EnterpriseSeatsReportDto>>(list);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<EnterpriseSeatsReportDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(EnterpriseSeatsReportDto), dynamicClass))
@@ -5549,7 +5549,7 @@ namespace Hotline.Api.Controllers.Bi
                 list = _mapper.Map<List<OrderDto>>(listData);
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
@@ -5617,7 +5617,7 @@ namespace Hotline.Api.Controllers.Bi
                 BackNum = datas.Sum(p => p.BackNum),
                 DutyDeskNum = datas.Sum(p => p.DutyDeskNum),
             });
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderCenterAcceptVo>(dto.ColumnInfos);
             var dtos = datas
                 .Select(stu => _mapper.Map(stu, typeof(OrderCenterAcceptVo), dynamicClass))
                 .Cast<object>()
@@ -5659,7 +5659,7 @@ namespace Hotline.Api.Controllers.Bi
                 var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
                 datas = items;
             }
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderCenterAcceptUserVo>(dto.ColumnInfos);
             var dtos = datas
                 .Select(stu => _mapper.Map(stu, typeof(OrderCenterAcceptUserVo), dynamicClass))
                 .Cast<object>()
@@ -5701,7 +5701,7 @@ namespace Hotline.Api.Controllers.Bi
                 var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
                 datas = items;
             }
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderCenterAcceptHourVo>(dto.ColumnInfos);
             var dtos = datas
                 .Select(stu => _mapper.Map(stu, typeof(OrderCenterAcceptHourVo), dynamicClass))
                 .Cast<object>()
@@ -5769,7 +5769,7 @@ namespace Hotline.Api.Controllers.Bi
                 orders = items;
             }
             var ordersDtos = _mapper.Map<ICollection<OrderDataInventoryRep>>(orders);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDataInventoryRep>(dto.ColumnInfos);
             var dtos = ordersDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDataInventoryRep), dynamicClass))
                 .Cast<object>()
@@ -5831,7 +5831,7 @@ namespace Hotline.Api.Controllers.Bi
             List<OrderVisitJudeStatisticsRep> exportList;
             exportList = await query.ToListAsync(HttpContext.RequestAborted);
             var ordersDtos = _mapper.Map<ICollection<OrderVisitJudeStatisticsRep>>(exportList);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderVisitJudeStatisticsRep>(dto.ColumnInfos);
             var dtos = ordersDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderVisitJudeStatisticsRep), dynamicClass))
                 .Cast<object>()
@@ -5877,7 +5877,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var listDtos = _mapper.Map<ICollection<OrderTsDetailsDto>>(lists);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderTsDetailsDto>(dto.ColumnInfos);
 
             var dtos = listDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderTsDetailsDto), dynamicClass))
@@ -5948,7 +5948,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var listDtos = _mapper.Map<ICollection<OrderTsDetailsDto>>(lists);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderTsDetailsDto>(dto.ColumnInfos);
 
             var dtos = listDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderTsDetailsDto), dynamicClass))
@@ -6026,7 +6026,7 @@ namespace Hotline.Api.Controllers.Bi
                 AuditNum = data.Sum(m => m.AuditNum)
             });
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<ExtendedSendBackVo>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(ExtendedSendBackVo), dynamicClass))
@@ -6073,7 +6073,7 @@ namespace Hotline.Api.Controllers.Bi
 
             var dataDtos = _mapper.Map<ICollection<SendBackDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SendBackDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(SendBackDto), dynamicClass))

src/Hotline.Api/Controllers/Bi/BiQualityController.cs

@@ -80,7 +80,7 @@ namespace Hotline.Api.Controllers.Bi
 
 			var listDtos = _mapper.Map<ICollection<SeatsQualityAnalyseDto>>(lists);
 
-			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SeatsQualityAnalyseDto>(dto.ColumnInfos);
 
 			var dtos = listDtos
 				.Select(stu => _mapper.Map(stu, typeof(SeatsQualityAnalyseDto), dynamicClass))
@@ -125,7 +125,7 @@ namespace Hotline.Api.Controllers.Bi
 
 			//var listDtos = _mapper.Map<ICollection<SeatsQualityAnalyseDto>>(lists);
 
-			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<QualityOrderOverviewDto>(dto.ColumnInfos);
 
 			var dtos = listDtos
 				.Select(stu => _mapper.Map(stu, typeof(QualityOrderOverviewDto), dynamicClass))

src/Hotline.Api/Controllers/CallController.cs

@@ -52,6 +52,13 @@ namespace Hotline.Api.Controllers
             _telOperationXthxRepository = telOperationXthxRepository;
         }
 
+        /// <summary>
+        /// 查询分机组和分机
+        /// </summary>
+        [HttpGet("querygrouptel")]
+        public Task<IReadOnlyList<TelGroupDto>> QueryGroupTel()
+            => _callApplication.QueryGroupTel(HttpContext.RequestAborted);
+
         /// <summary>
         /// 查询分机
         /// </summary>

src/Hotline.Api/Controllers/ContingencyManagementController.cs

@@ -94,7 +94,7 @@ namespace Hotline.Api.Controllers
                 data = items;
             }
             var dataDtos = _mapper.Map<ICollection<ContingencyManagementOrdersDto>>(data);
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<ContingencyManagementOrdersDto>(dto.ColumnInfos);
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(ContingencyManagementOrdersDto), dynamicClass))
                 .Cast<object>()

src/Hotline.Api/Controllers/EnterpriseLuzhouController.cs

@@ -139,7 +139,7 @@ namespace Hotline.Api.Controllers
             if (_appOptions.Value.IsLuZhou && !_sessionContext.OrgIsCenter)
                 orderDtos = orderDtos.Select(p => p.DataMask()).ToList();
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
 
             var dtos = orderDtos
                 .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))

src/Hotline.Api/Controllers/FileController.cs

@@ -268,7 +268,7 @@ namespace Hotline.Api.Controllers
 
             var listDtos = _mapper.Map<ICollection<UploadAudioFilesRequestDto>>(lists);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<UploadAudioFilesRequestDto>(dto.ColumnInfos);
 
             var dtos = listDtos
                 .Select(stu => _mapper.Map(stu, typeof(UploadAudioFilesRequestDto), dynamicClass))

src/Hotline.Api/Controllers/IPPbxController.cs

@@ -734,7 +734,7 @@ namespace Hotline.Api.Controllers
                 }
             });
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<TrCallDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(TrCallDto), dynamicClass))

src/Hotline.Api/Controllers/IndustrialManagementController.cs

@@ -220,7 +220,7 @@ namespace Hotline.Api.Controllers
                 data = items;
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<IndustrialManagementDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(IndustrialManagementDto), dynamicClass))
@@ -263,7 +263,7 @@ namespace Hotline.Api.Controllers
                 data = items;
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<IndustrialManagementOrderDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(IndustrialManagementOrderDto), dynamicClass))

src/Hotline.Api/Controllers/JudicialManagementOrdersController.cs

@@ -321,7 +321,7 @@ namespace Hotline.Api.Controllers
 
             var dataDtos = _mapper.Map<ICollection<EnforcementOrderListDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<EnforcementOrderListDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(EnforcementOrderListDto), dynamicClass))
@@ -376,7 +376,7 @@ namespace Hotline.Api.Controllers
 
             var dataDtos = _mapper.Map<ICollection<EnforcementOrderListDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<EnforcementOrderListDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(EnforcementOrderListDto), dynamicClass))
@@ -627,7 +627,7 @@ namespace Hotline.Api.Controllers
 
             var dataDtos = _mapper.Map<ICollection<EnforcementOrderListDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<EnforcementOrderListDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(EnforcementOrderListDto), dynamicClass))
@@ -671,7 +671,7 @@ namespace Hotline.Api.Controllers
                 EnforcementOrder = list.Sum(p => p.EnforcementOrder)
             });
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<EmDepartmentalProcessingStatisticsDto>(dto.ColumnInfos);
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(EmDepartmentalProcessingStatisticsDto), dynamicClass))
                 .Cast<object>()
@@ -715,7 +715,7 @@ namespace Hotline.Api.Controllers
                 data = items;
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<EnforcementOrderListDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(EnforcementOrderListDto), dynamicClass))
@@ -755,7 +755,7 @@ namespace Hotline.Api.Controllers
                 TheClueIsNotTrue = list.Sum(x => x.TheClueIsNotTrue),
                 EnforcementOrder = list.Sum(x => x.EnforcementOrder)
             });
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<RegionalClassificationStatisticsDto>(dto.ColumnInfos);
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(RegionalClassificationStatisticsDto), dynamicClass))
                 .Cast<object>()
@@ -800,7 +800,7 @@ namespace Hotline.Api.Controllers
 
             var dataDtos = _mapper.Map<ICollection<EnforcementOrderListDto>>(data);
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<EnforcementOrderListDto>(dto.ColumnInfos);
 
             var dtos = dataDtos
                 .Select(stu => _mapper.Map(stu, typeof(EnforcementOrderListDto), dynamicClass))
@@ -860,7 +860,7 @@ namespace Hotline.Api.Controllers
                 NoEvaluateCount = list.Sum(x => x.NoEvaluateCount),
                 NoPutThroughCount = list.Sum(x => x.NoPutThroughCount),
             });
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<VisitAndOrgSatisfactionStatisticsDto>(dto.ColumnInfos);
             var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(VisitAndOrgSatisfactionStatisticsDto), dynamicClass))
                 .Cast<object>()
@@ -904,7 +904,7 @@ namespace Hotline.Api.Controllers
                 data = items;
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<EnforcementOrgSatisfactionOrderListDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(EnforcementOrgSatisfactionOrderListDto), dynamicClass))

src/Hotline.Api/Controllers/OrderController.cs

@@ -373,7 +373,7 @@ public class OrderController : BaseController
 
         var orderDtos = _mapper.Map<ICollection<PublishDto>>(orders);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<PublishDto>(dto.ColumnInfos);
 
         var dtos = orderDtos
             .Select(stu => _mapper.Map(stu, typeof(PublishDto), dynamicClass))
@@ -878,7 +878,7 @@ public class OrderController : BaseController
 
         var orderDtos = _mapper.Map<ICollection<PublishedDto>>(orders);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<PublishedDto>(dto.ColumnInfos);
 
         var dtos = orderDtos
             .Select(stu => _mapper.Map(stu, typeof(PublishedDto), dynamicClass))
@@ -1115,7 +1115,7 @@ public class OrderController : BaseController
 
         var orderDtos = _mapper.Map<ICollection<OrderVisitDto>>(orders);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderVisitDto>(dto.ColumnInfos);
 
         var dtos = orderDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderVisitDto), dynamicClass))
@@ -1555,7 +1555,7 @@ public class OrderController : BaseController
         }
 
         var orderDtos = _mapper.Map<ICollection<OrderVisitDto>>(datas);
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderVisitDto>(dto.ColumnInfos);
         var dtos = orderDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderVisitDto), dynamicClass))
             .Cast<object>()
@@ -1687,7 +1687,7 @@ public class OrderController : BaseController
             orders = items;
         }
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrgVisitDetailListResp>(dto.ColumnInfos);
         var dtos = orders
             .Select(stu => _mapper.Map(stu, typeof(OrgVisitDetailListResp), dynamicClass))
             .Cast<object>()
@@ -2380,7 +2380,7 @@ public class OrderController : BaseController
 
         var orderDtos = _mapper.Map<ICollection<OrderDelayDto>>(orders);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDelayDto>(dto.ColumnInfos);
 
         var dtos = orderDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderDelayDto), dynamicClass))
@@ -2429,7 +2429,7 @@ public class OrderController : BaseController
 
         var orderDtos = _mapper.Map<ICollection<OrderDelayDto>>(orders);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDelayDto>(dto.ColumnInfos);
 
         var dtos = orderDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderDelayDto), dynamicClass))
@@ -2596,7 +2596,7 @@ public class OrderController : BaseController
 
         var dataDtos = _mapper.Map<ICollection<OrderVisitDetailDto>>(data);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderVisitDetailDto>(dto.ColumnInfos);
 
         var dtos = dataDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderVisitDetailDto), dynamicClass))
@@ -2644,7 +2644,7 @@ public class OrderController : BaseController
 
         var dataDtos = _mapper.Map<ICollection<OrderScreenListDto>>(data);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderScreenListDto>(dto.ColumnInfos);
 
         var dtos = dataDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderScreenListDto), dynamicClass))
@@ -5998,7 +5998,7 @@ public class OrderController : BaseController
 
         var dataDtos = _mapper.Map<ICollection<SendBackDto>>(data);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SendBackDto>(dto.ColumnInfos);
 
         var dtos = dataDtos
             .Select(stu => _mapper.Map(stu, typeof(SendBackDto), dynamicClass))
@@ -7817,7 +7817,7 @@ public class OrderController : BaseController
 
         var orderDtos = _mapper.Map<ICollection<OrderWordDto>>(list);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderWordDto>(dto.ColumnInfos);
 
         var dtos = orderDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderWordDto), dynamicClass))
@@ -7942,7 +7942,7 @@ public class OrderController : BaseController
 
         var dataDtos = _mapper.Map<ICollection<OrderObserveDto>>(data);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderObserveDto>(dto.ColumnInfos);
 
         var dtos = dataDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderObserveDto), dynamicClass))
@@ -8137,7 +8137,7 @@ public class OrderController : BaseController
         }
 
         var ordersDtos = _mapper.Map<ICollection<OrderDto>>(orders);
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
         var dtos = ordersDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
             .Cast<object>()
@@ -8190,7 +8190,7 @@ public class OrderController : BaseController
         }
 
         var ordersDtos = _mapper.Map<ICollection<OrderDto>>(orders);
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDto>(dto.ColumnInfos);
         var dtos = ordersDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderDto), dynamicClass))
             .Cast<object>()
@@ -8574,7 +8574,7 @@ public class OrderController : BaseController
 
         var visitDetailsDtos = _mapper.Map<ICollection<OrderVisitDetailDto>>(visitDetails);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderVisitDetailDto>(dto.ColumnInfos);
 
         var dtos = visitDetailsDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderVisitDetailDto), dynamicClass))
@@ -8620,7 +8620,7 @@ public class OrderController : BaseController
 
         var secondaryHandlingDtos = _mapper.Map<ICollection<OrderSecondaryHandlingDto>>(secondaryHandling);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderSecondaryHandlingDto>(dto.ColumnInfos);
 
         var dtos = secondaryHandlingDtos
             .Select(stu => _mapper.Map(stu, typeof(OrderSecondaryHandlingDto), dynamicClass))

src/Hotline.Api/Controllers/OrderTerminateController.cs

@@ -132,7 +132,7 @@ namespace Hotline.Api.Controllers
 
 			var dataDtos = _mapper.Map<ICollection<OrderTerminateEntityDto>>(data);
 
-			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderTerminateEntityDto>(dto.ColumnInfos);
 
 			var dtos = dataDtos
 				.Select(stu => _mapper.Map(stu, typeof(OrderTerminateEntityDto), dynamicClass))

src/Hotline.Api/Controllers/StatisticalReportController.cs

@@ -64,7 +64,7 @@ namespace Hotline.Api.Controllers
                 data = await query.ToPageListAsync(dto.QueryDto.PageIndex, dto.QueryDto.PageSize, total);
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SeatReturnOrderListDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(SeatReturnOrderListDto), dynamicClass))
@@ -112,7 +112,7 @@ namespace Hotline.Api.Controllers
                 data = await query.ToPageListAsync(dto.QueryDto.PageIndex, dto.QueryDto.PageSize, total);
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SeatReturnOrderListDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(SeatReturnOrderListDto), dynamicClass))
@@ -156,7 +156,7 @@ namespace Hotline.Api.Controllers
                 data = await query.ToPageListAsync(dto.QueryDto.PageIndex, dto.QueryDto.PageSize, total);
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<OrderDelayStatisicalReturnDto>(dto.ColumnInfos);
 
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(OrderDelayStatisicalReturnDto), dynamicClass))

src/Hotline.Api/Controllers/TelController.cs

@@ -48,9 +48,10 @@ namespace Hotline.Api.Controllers
         [HttpGet("groups")]
         public async Task<IReadOnlyList<TelGroupDto>> QueryTelGroup()
         {
-            return await _telGroupRepository.Queryable()
-                .Select<TelGroupDto>()
-                .ToListAsync(HttpContext.RequestAborted); 
+            var data = await _telGroupRepository.Queryable()//.Includes(d => d.Tels)
+              .Select<TelGroupDto>()
+              .ToListAsync(HttpContext.RequestAborted);
+            return _mapper.Map<IReadOnlyList<TelGroupDto>>(data);
         }
     }
 }

src/Hotline.Api/Controllers/TelRestController.cs

@@ -194,7 +194,7 @@ namespace Hotline.Api.Controllers
                 var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
                 data = items;
             }
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<TelRestApplyListDto>(dto.ColumnInfos);
             var dtos = data
                 .Select(stu => _mapper.Map(stu, typeof(TelRestApplyListDto), dynamicClass))
                 .Cast<object>()

src/Hotline.Api/Controllers/UserController.cs

@@ -209,7 +209,7 @@ public class UserController : BaseController
 
         var dataDtos = _mapper.Map<ICollection<UserDto>>(data);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<UserDto>(dto.ColumnInfos);
 
         var dtos = dataDtos
             .Select(stu => _mapper.Map(stu, typeof(UserDto), dynamicClass))

src/Hotline.Api/Controllers/WorkflowController.cs

@@ -611,7 +611,7 @@ public class WorkflowController : BaseController
 
         var dataDtos = _mapper.Map<ICollection<WorkflowCountersignDto>>(data);
 
-        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<WorkflowCountersignDto>(dto.ColumnInfos);
 
         var dtos = dataDtos
             .Select(stu => _mapper.Map(stu, typeof(WorkflowCountersignDto), dynamicClass))

src/Hotline.Application/CallCenter/DefaultCallApplication.cs

@@ -22,6 +22,8 @@ using Hotline.Users;
 using JiebaNet.Segmenter.Common;
 using Mapster;
 using MapsterMapper;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using SqlSugar;
 using XF.Domain.Authentications;
@@ -99,6 +101,18 @@ public abstract class DefaultCallApplication : ICallApplication
     {
     }
 
+    /// <summary>
+    /// 查询分机组和分机
+    /// </summary>
+    /// <returns></returns>
+    public virtual async Task<IReadOnlyList<TelGroupDto>> QueryGroupTel(CancellationToken cancellationToken)
+    {
+        var data = await _telGroupRepository.Queryable().Includes(d => d.Tels)
+         // .Select<TelGroupDto>()
+          .ToListAsync(cancellationToken);
+        return _mapper.Map<IReadOnlyList<TelGroupDto>>(data);
+    }
+
     /// <summary>
     /// 查询分机
     /// </summary>

src/Hotline.Application/CallCenter/ICallApplication.cs

@@ -20,6 +20,12 @@ namespace Hotline.Application.CallCenter
         /// <returns></returns>
         Task EndActionAsync(EndActionInDto inDto);
 
+        /// <summary>
+        /// 查询分机组和分机
+        /// </summary>
+        /// <returns></returns>
+        Task<IReadOnlyList<TelGroupDto>> QueryGroupTel(CancellationToken cancellationToken);
+
         /// <summary>
         /// 查询分机
         /// </summary>

src/Hotline.Application/ExportExcel/ExportApplication.cs

@@ -56,7 +56,7 @@ namespace Hotline.Application.ExportExcel
                 items.Add(func.Invoke(items));
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos, typeof(T));
 
             var dtos = items
                 .Select(stu => _mapper.Map(stu, typeof(T), dynamicClass))
@@ -115,7 +115,7 @@ namespace Hotline.Application.ExportExcel
                 throw new ArgumentException("ColumnInfos not found in dto");
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(columnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(columnInfos, typeT);
 
             var dtos = items
                 .Select(item =>
@@ -125,9 +125,9 @@ namespace Hotline.Application.ExportExcel
                     {
                         if (prop.PropertyType == typeof(string))
                         {
-                            if((string)prop.GetValue(mappedItem) == "True")
+                            if ((string)prop.GetValue(mappedItem) == "True")
                                 prop.SetValue(mappedItem, "是");
-                            if((string)prop.GetValue(mappedItem) == "False")
+                            if ((string)prop.GetValue(mappedItem) == "False")
                                 prop.SetValue(mappedItem, "否");
                         }
                     }

src/Hotline.Application/Knowledge/KnowApplication.cs

@@ -439,6 +439,7 @@ namespace Hotline.Application.Knowledge
                 .Includes(x => x.KnowledgeType)
                 .Where(x => x.IsDeleted == false)
                 .Where(x => x.Status == EKnowledgeStatus.OnShelf)
+                .Where(x => SqlFunc.HasValue(x.ExpiredTime) == false || x.ExpiredTime > DateTime.Now)
                 //.Where(x => x.KnowledgeType.Any(t => t.KnowledgeType.KnowledgeTypeOrgs.Any(to => to.OrgId == _sessionContext.RequiredOrgId)
                 //                                     || t.KnowledgeType.KnowledgeTypeOrgs.Any() == false))
                 //.WhereIF(!string.IsNullOrEmpty(typeSpliceName), x => x.KnowledgeType.Any(t => t.KnowledgeTypeSpliceName.StartsWith(typeSpliceName)))

src/Hotline.Application/Orders/OrderApplication.cs

@@ -802,12 +802,12 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.HotspotSpliceName != null && d.HotspotSpliceName.Contains(dto.Hotspot))
             .WhereIF(!string.IsNullOrEmpty(dto.OrgLevelOneName), d => d.OrgLevelOneName.Contains(dto.OrgLevelOneName)) //一级部门
             .WhereIF(!string.IsNullOrEmpty(dto.FromPhone), d => d.FromPhone == dto.FromPhone) //来电号码
-			.WhereIF(!string.IsNullOrEmpty(dto.Contact), d => d.Contact == dto.Contact) //联系电话
-																								//.WhereIF(!string.IsNullOrEmpty(dto.PubMan),
-																								//    d => d.AcceptorName.Contains(dto.PubMan!) || d.AcceptorStaffNo.Contains(dto.PubMan!))
-																								//.WhereIF(dto.PubRange == EPublicState.Pub, d => d.OrderPublish.PublishState)
-																								//.WhereIF(dto.PubRange == EPublicState.NoPub, d => !d.OrderPublish.PublishState)
-			.WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == true, d => d.IsProvince == true)
+            .WhereIF(!string.IsNullOrEmpty(dto.Contact), d => d.Contact == dto.Contact) //联系电话
+                                                                                        //.WhereIF(!string.IsNullOrEmpty(dto.PubMan),
+                                                                                        //    d => d.AcceptorName.Contains(dto.PubMan!) || d.AcceptorStaffNo.Contains(dto.PubMan!))
+                                                                                        //.WhereIF(dto.PubRange == EPublicState.Pub, d => d.OrderPublish.PublishState)
+                                                                                        //.WhereIF(dto.PubRange == EPublicState.NoPub, d => !d.OrderPublish.PublishState)
+            .WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == true, d => d.IsProvince == true)
             .WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == false, d => d.IsProvince == false)
             //.WhereIF(dto.FiledType != null && dto.FiledType == FiledType.CenterFiled, d => d.ProcessType == EProcessType.Zhiban)
             //.WhereIF(dto.FiledType != null && dto.FiledType == FiledType.OrgFiled, d => d.ProcessType == EProcessType.Jiaoban)
@@ -3418,9 +3418,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .OrderByIF(dto is { SortRule: 1, SortField: "orderVisit.visitTime" }, x => x.OrderVisit.VisitTime, OrderByType.Desc)
             .OrderByIF(dto is { SortRule: 0, SortField: "screenByEndTime" }, x => x.ScreenByEndTime, OrderByType.Asc)//截止申请日期排序
             .OrderByIF(dto is { SortRule: 1, SortField: "screenByEndTime" }, x => x.ScreenByEndTime, OrderByType.Desc)
-            .OrderByIF(dto.SortRule is null, x => x.CreationTime, OrderByType.Desc)
+            //.OrderByIF(dto.SortRule is null, x => x.CreationTime, OrderByType.Desc)
             .OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.OrderVisit.Order.IsUrgent, OrderByType.Desc)
-            .OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.OrderVisit.Order.StartTime, OrderByType.Desc);
+            .OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.OrderVisit.Order.CreationTime, OrderByType.Desc);
     }
 
     #endregion
@@ -3632,7 +3632,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 d => SqlFunc.Subqueryable<OrderRelationTag>().InnerJoin<SystemDicData>((s, p) => s.TagId == p.Id)
                     .Where((s, p) => p.DicDataValue == dto.OrderTagCode && d.OrderId == s.OrderId).Any()) //工单标签
             .OrderByIF(_appOptions.Value.IsYiBin && dto.VisitStateQuery != EVisitStateQuery.Visited, d => d.Order.IsUrgent, OrderByType.Desc)
-             .OrderByIF(_appOptions.Value.IsZiGong == false, d => d.PublishTime, OrderByType.Desc)
+            .OrderByIF(_appOptions.Value.IsZiGong == false, d => d.PublishTime, OrderByType.Desc)
             //.OrderByDescending(d => d.PublishTime)
             .OrderByIF(dto is { SortField: "publishTime", SortRule: 0 }, x => x.PublishTime, OrderByType.Asc) // 发布时间升序
             .OrderByIF(dto is { SortField: "publishTime", SortRule: 1 }, x => x.PublishTime, OrderByType.Desc)// 发布时间升序
@@ -3641,8 +3641,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .OrderByIF(dto is { SortField: "order.filedTime", SortRule: 0 }, x => x.Order.FiledTime, OrderByType.Asc) // 办结时间升序
             .OrderByIF(dto is { SortField: "order.filedTime", SortRule: 1 }, x => x.Order.FiledTime, OrderByType.Desc) // 办结时间升序
             .OrderByIF(_appOptions.Value.IsZiGong && string.IsNullOrEmpty(dto.SortField), d => d.PublishTime, OrderByType.Desc)
-            .OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.Order.IsUrgent, OrderByType.Desc)
-            .OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.PublishTime, OrderByType.Desc)
             ;
         return query;
     }
@@ -4864,10 +4862,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 .OrderByIF(dto.TypeCode != 0, d => d.StartTime, OrderByType.Desc)
                 .OrderByIF(dto.IsHandled == false && !string.IsNullOrEmpty(dto.SortField), d => new { IsUrgent = d.IsUrgent }, OrderByType.Desc)
                 //.OrderByIF(dto.IsHandled == false, d => new { d.Status })
+                //.OrderByIF(dto.TypeCode == 0 && string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc)
+                .OrderByIF(dto.TypeCode == 0 && string.IsNullOrEmpty(dto.SortField), d => d.IsUrgent, OrderByType.Desc)
                 .OrderByIF(dto.TypeCode == 0 && string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc)
-
-                .OrderByIF(string.IsNullOrEmpty(dto.SortField), d => d.IsUrgent, OrderByType.Desc)
-                .OrderByIF(string.IsNullOrEmpty(dto.SortField), d => d.StartTime, OrderByType.Desc)
                 .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, d => d.CreationTime, OrderByType.Asc) //创建时间升序
                 .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, d => d.CreationTime, OrderByType.Desc) //创建时间降序
                 .OrderByIF(dto is { SortField: "startTime", SortRule: 0 }, d => d.StartTime, OrderByType.Asc) //受理时间升序