소스 검색

未签收统计

田爽 11 달 전
부모
커밋
d855f056da
3개의 변경된 파일12개의 추가작업 그리고 12개의 파일을 삭제
  1. 7 7
      src/Hotline.Api/Controllers/Bi/BiOrderController.cs
  2. 3 3
      src/Hotline.Share/Dtos/Order/OrderDto.cs
  3. 2 2
      src/Hotline/Orders/Order.cs

+ 7 - 7
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -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();
 

+ 3 - 3
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -784,10 +784,10 @@ namespace Hotline.Share.Dtos.Order
 
     public class UnsignedOrderDto { 
     
-        public OrderDto order { get; set; }
+        public OrderDto Order { get; set; }
 
-        public WorkflowStepDto workflowStep { get; set; }
+        public WorkflowStepDto WorkflowStep { get; set; }
 
         public decimal UnsignedTime { get; set; }
-	}
+    }
 }

+ 2 - 2
src/Hotline/Orders/Order.cs

@@ -983,8 +983,8 @@ namespace Hotline.Orders
 
     public class UnsignedOrder
     {
-	    public Order order { get; set; }
+	    public Order Order { get; set; }
 
-	    public WorkflowStep workflowStep { get; set; }
+	    public WorkflowStep WorkflowStep { get; set; }
     }
 }