|
@@ -1227,12 +1227,21 @@ namespace DataSharing.Application.Receivers
|
|
|
/// <returns></returns>
|
|
|
private async Task SubmitCaseResultAsync(OrderFlowDto dto, CancellationToken cancellationToken)
|
|
|
{
|
|
|
+
|
|
|
var data = _mapper.Map<SubmitCaseResultInfo>(dto);
|
|
|
data.ConcactType = "40";
|
|
|
data.FinishType = "1";
|
|
|
data.HandleTimeLong = (int)dto.Order.AllDuration;
|
|
|
data.CliengGuid = Guid.NewGuid().ToString();
|
|
|
|
|
|
+ //宜宾工单不超期,如果在推送省上数据时,实际办理时间大于过期时间,则将办理时间改成过期时间减2个小时
|
|
|
+ if (dto.Order.ExpiredTime < dto.Order.ActualHandleTime)
|
|
|
+ {
|
|
|
+ var finishTime = dto.Order.ExpiredTime.Value.AddHours(-2);
|
|
|
+ data.FinishTime = finishTime;
|
|
|
+ data.FdBackTime = finishTime;
|
|
|
+ }
|
|
|
+
|
|
|
#region 处理请求参数
|
|
|
var configProvince = _channelConfigurationManager.GetConfigurationProvince();
|
|
|
var request = new ProvinceListRequest<SubmitCaseResultInfo>(configProvince.ClientId, configProvince.ClientSecret);
|
|
@@ -1245,7 +1254,8 @@ namespace DataSharing.Application.Receivers
|
|
|
await InitPushDataAsync("SubmitCaseResult", "submit_case_result", jsonData, pathType: EPathType.HuiJu, cancellationToken: cancellationToken);
|
|
|
|
|
|
//处理附件
|
|
|
- await FileDataAsync(dto.WorkflowTrace.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Result, dto.Order.AreaCode, cancellationToken);
|
|
|
+ if (dto.WorkflowTrace != null && dto.WorkflowTrace.FileJson != null && dto.WorkflowTrace.FileJson.Count > 0)
|
|
|
+ await FileDataAsync(dto.WorkflowTrace.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Result, dto.Order.AreaCode, cancellationToken);
|
|
|
//判断如果是110过来的数据,就组装数据
|
|
|
//组装110
|
|
|
if (dto.Order.Source == ESource.Police110)
|