|
@@ -3170,7 +3170,7 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
var itemsVo = _mapper.Map<IReadOnlyList<UnsignedOrderDto>>(items);
|
|
|
foreach (var item in itemsVo)
|
|
|
{
|
|
|
- item.UnsignedTime = _timeLimitDomainService.CalcWorkTimeToHour(item.workflowStep.CreationTime, item.workflowStep.Status == EWorkflowStepStatus.WaitForAccept ? DateTime.Now : item.workflowStep.AcceptTime!.Value, false);
|
|
|
+ item.UnsignedTime = _timeLimitDomainService.CalcWorkTimeToHour(item.workflowStep.CreationTime, item.workflowStep.Status == EWorkflowStepStatus.WaitForAccept ? DateTime.Now : item.workflowStep.AcceptTime!.Value, false);
|
|
|
}
|
|
|
return new PagedDto<UnsignedOrderDto>(total, itemsVo);
|
|
|
}
|
|
@@ -3193,17 +3193,17 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
unsignedOrders = items;
|
|
|
}
|
|
|
|
|
|
- var secondaryHandlingDtos = _mapper.Map<ICollection<UnsignedOrderDto>>(unsignedOrders);
|
|
|
+ var unsignedOrderDtos = _mapper.Map<ICollection<UnsignedOrderDto>>(unsignedOrders);
|
|
|
|
|
|
- foreach (var item in secondaryHandlingDtos)
|
|
|
+ foreach (var item in unsignedOrderDtos)
|
|
|
{
|
|
|
- item.UnsignedTime = _timeLimitDomainService.CalcWorkTimeToHour(item.workflowStep.CreationTime, item.workflowStep.Status == EWorkflowStepStatus.WaitForAccept ? DateTime.Now : item.workflowStep.AcceptTime!.Value, false);
|
|
|
- }
|
|
|
+ item.UnsignedTime = _timeLimitDomainService.CalcWorkTimeToHour(item.workflowStep.CreationTime, item.workflowStep.Status == EWorkflowStepStatus.WaitForAccept ? DateTime.Now : item.workflowStep.AcceptTime!.Value, false);
|
|
|
+ }
|
|
|
|
|
|
dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
|
|
|
|
|
|
- var dtos = secondaryHandlingDtos
|
|
|
- .Select(stu => _mapper.Map(stu, typeof(UnsignedOrderDto), dynamicClass))
|
|
|
+ var dtos = unsignedOrderDtos
|
|
|
+ .Select(stu => _mapper.Map(stu, typeof(UnsignedOrderDto), dynamicClass))
|
|
|
.Cast<object>()
|
|
|
.ToList();
|
|
|
|