|
|
@@ -641,10 +641,14 @@ namespace DataSharing.Application.Receivers
|
|
|
if (dataOrder != null)
|
|
|
{
|
|
|
dataOrder.HandleState = "办理完成";
|
|
|
- dataOrder.ActualHandleOrgName = dto.WorkflowTrace.HandlerOrgName;
|
|
|
- dataOrder.ActualHandleOrgCode = dto.WorkflowTrace.HandlerOrgAreaCode;
|
|
|
- dataOrder.ActualOpinion = string.IsNullOrEmpty(dto.WorkflowTrace.Opinion) == true ? dto.Order.ActualOpinion : dto.WorkflowTrace.Opinion;
|
|
|
- dataOrder.ActualHandleTime = dto.WorkflowTrace.HandleTime;
|
|
|
+ //dataOrder.ActualHandleOrgName = dto.WorkflowTrace.HandlerOrgName;
|
|
|
+ //dataOrder.ActualHandleOrgCode = dto.WorkflowTrace.HandlerOrgAreaCode;
|
|
|
+ //dataOrder.ActualOpinion = string.IsNullOrEmpty(dto.WorkflowTrace.Opinion) == true ? dto.Order.ActualOpinion : dto.WorkflowTrace.Opinion;
|
|
|
+ //dataOrder.ActualHandleTime = dto.WorkflowTrace.HandleTime;
|
|
|
+ dataOrder.ActualHandleOrgName = dto.Order.ActualHandleOrgName;
|
|
|
+ dataOrder.ActualHandleOrgCode = dto.Order.ActualHandleOrgCode;
|
|
|
+ dataOrder.ActualOpinion = !string.IsNullOrEmpty(dto.Order.ActualOpinion) == true ? dto.Order.ActualOpinion : dto.WorkflowTrace.Opinion;
|
|
|
+ dataOrder.ActualHandleTime = dto.Order.FiledTime;
|
|
|
await _dsOrderRepository.UpdateAsync(dataOrder, cancellationToken);
|
|
|
}
|
|
|
else
|
|
|
@@ -674,10 +678,10 @@ namespace DataSharing.Application.Receivers
|
|
|
AllDuration = 0,
|
|
|
IsProvince = order.IsProvince,
|
|
|
HandleState = "办理完成",
|
|
|
- ActualHandleOrgName = dto.WorkflowTrace.HandlerOrgName,
|
|
|
- ActualHandleOrgCode = dto.WorkflowTrace.HandlerOrgAreaCode,
|
|
|
- ActualOpinion = string.IsNullOrEmpty(dto.WorkflowTrace.Opinion) == true ? order.ActualOpinion : dto.WorkflowTrace.Opinion,
|
|
|
- ActualHandleTime = dto.WorkflowTrace.HandleTime,
|
|
|
+ ActualHandleOrgName = order.ActualHandleOrgName,
|
|
|
+ ActualHandleOrgCode = order.ActualHandleOrgCode,
|
|
|
+ ActualOpinion = !string.IsNullOrEmpty(order.ActualOpinion) == true ? order.ActualOpinion : dto.WorkflowTrace.Opinion,
|
|
|
+ ActualHandleTime = order.FiledTime,
|
|
|
StartTime = order.StartTime,
|
|
|
CallId = order.CallId,
|
|
|
FileJson = _mapper.Map<List<FileJson>>(order.FileJson)
|
