src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -208,7 +208,7 @@ namespace DataSharing.Application.Receivers
                     CaseTypeCode = dto.AcceptTypeCode,
                     AllDuration = 0,
                     IsProvince = dto.IsProvince,
-                    HandleState = "办理中",
+                    HandleState = dto.Status >= EOrderStatus.Filed ? "办理完成" : "办理中",
                     StartTime = dto.StartTime,
                     CallId = dto.CallId,
                     FileJson = _mapper.Map<List<DataSharing.Share.Dtos.FileJson>>(dto.FileJson)
@@ -243,9 +243,10 @@ namespace DataSharing.Application.Receivers
                         dataOrderNew.CaseTypeCode = dto.AcceptTypeCode;
                         dataOrderNew.AllDuration = 0;
                         dataOrderNew.IsProvince = dto.IsProvince;
-                        dataOrderNew.HandleState = "办理中";
+                        dataOrderNew.HandleState = dto.Status >= EOrderStatus.Filed ? "办理完成" : "办理中";
                         dataOrderNew.StartTime = dto.StartTime;
                         dataOrderNew.CallId = dto.CallId;
+                        dataOrderNew.ActualHandleTime = dto.ActualHandleTime;
                         dataOrderNew.FileJson = _mapper.Map<List<DataSharing.Share.Dtos.FileJson>>(dto.FileJson);
                         await _dsOrderRepository.UpdateAsync(dataOrderNew, cancellationToken);
                     }
@@ -272,9 +273,10 @@ namespace DataSharing.Application.Receivers
                 dataOrder.CaseTypeCode = dto.AcceptTypeCode;
                 dataOrder.AllDuration = 0;
                 dataOrder.IsProvince = dto.IsProvince;
-                dataOrder.HandleState = "办理中";
+                dataOrder.HandleState = dto.Status >= EOrderStatus.Filed ? "办理完成" : "办理中";
                 dataOrder.StartTime = dto.StartTime;
                 dataOrder.CallId = dto.CallId;
+                dataOrder.ActualHandleTime = dto.ActualHandleTime;
                 dataOrder.FileJson = _mapper.Map<List<DataSharing.Share.Dtos.FileJson>>(dto.FileJson);
 
                 await _dsOrderRepository.UpdateAsync(dataOrder, cancellationToken);
@@ -292,6 +294,9 @@ namespace DataSharing.Application.Receivers
                 orderSend.CaseSource = dto.SourceChannel;
                 orderSend.CaseSourceCode = dto.SourceChannelCode;
                 orderSend.ExpiredTime = dto.ExpiredTime;
+                orderSend.HandleState = dto.Status >= EOrderStatus.Filed ? "办理完成" : "办理中";
+                orderSend.ActualHandleTime = dto.ActualHandleTime;
+                orderSend.FiledTime = dto.FiledTime;
                 await _orderSendRepository.UpdateAsync(orderSend, cancellationToken);
             }
             else
@@ -308,7 +313,8 @@ namespace DataSharing.Application.Receivers
                     Source = dto.Source.ToString(),
                     CaseSource = dto.SourceChannel,
                     CaseSourceCode = dto.SourceChannelCode,
-                    ExpiredTime = dto.ExpiredTime
+                    ExpiredTime = dto.ExpiredTime,
+                    HandleState = dto.Status >= EOrderStatus.Filed ? "办理完成" : "办理中",
                 };
                 try
                 {
@@ -326,6 +332,7 @@ namespace DataSharing.Application.Receivers
                         orderSendNew.CaseSource = dto.SourceChannel;
                         orderSendNew.CaseSourceCode = dto.SourceChannelCode;
                         orderSendNew.ExpiredTime = dto.ExpiredTime;
+                        orderSendNew.HandleState = dto.Status >= EOrderStatus.Filed ? "办理完成" : "办理中";
                         await _orderSendRepository.UpdateAsync(orderSendNew, cancellationToken);
                     }
                 }
@@ -580,7 +587,7 @@ namespace DataSharing.Application.Receivers
                     CaseSource = dto.Order.SourceChannel,
                     CaseSourceCode = dto.Order.SourceChannelCode,
                     ExpiredTime = dto.Order.ExpiredTime,
-                    HandleState = "办理完成",
+                    HandleState = dto.Order.Status >= EOrderStatus.Filed ? "办理完成" : "办理中",
                     ActualHandleTime = dto.Order.ActualHandleTime,
                     FiledTime = dto.Order.FiledTime,
                 };
@@ -593,7 +600,7 @@ namespace DataSharing.Application.Receivers
                     var orderSendNew = await _orderSendRepository.GetAsync(p => p.OrderId == dto.Order.Id, cancellationToken);
                     if (orderSendNew != null)
                     {
-                        orderSendNew.HandleState = "办理完成";
+                        orderSendNew.HandleState = dto.Order.Status >= EOrderStatus.Filed ? "办理完成" : "办理中";
                         orderSendNew.ActualHandleTime = dto.Order.ActualHandleTime;
                         orderSendNew.FiledTime = dto.Order.FiledTime;
                         orderSendNew.CaseDate = Convert.ToDateTime(dto.Order.CreationTime);
@@ -603,6 +610,8 @@ namespace DataSharing.Application.Receivers
                         orderSendNew.CaseSource = dto.Order.SourceChannel;
                         orderSendNew.CaseSourceCode = dto.Order.SourceChannelCode;
                         orderSendNew.ExpiredTime = dto.Order.ExpiredTime;
+                        orderSendNew.ActualHandleTime = dto.Order.ActualHandleTime;
+                        orderSendNew.FiledTime = dto.Order.FiledTime;
                         await _orderSendRepository.UpdateAsync(orderSendNew, cancellationToken);
                     }
                 }