TANG JIANG 1 năm trước cách đây
mục cha
commit
895338c9c0

+ 7 - 5
src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -181,7 +181,7 @@ namespace DataSharing.Application.Receivers
                             #endregion
 
                             //将待推送数据写入待推送表
-                            await InitPushDataAsync("GetCaseBackApply", "get_case_back_apply", jsonData, pathType: EPathType.XieTong, GenerationTime:dto.Order.StartTime, cancellationToken: cancellationToken);
+                            await InitPushDataAsync("GetCaseBackApply", "get_case_back_apply", jsonData, pathType: EPathType.XieTong, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
 
                             //处理附件
                             await FileDataAsync(dto.SendBack.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken: cancellationToken);
@@ -687,8 +687,9 @@ namespace DataSharing.Application.Receivers
             var url = configProvince.HuiJu + "submit_case_record";
             #endregion
 
+            var startTime = dto.Order == null ? dto.TrCallRecordDto.BeginIvrTime : dto.Order.StartTime;
             //将待推送数据写入待推送表
-            var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonData, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
+            var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonData, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: startTime, cancellationToken: cancellationToken);
 
             //本地保存通话记录数据
             await InitTelCallData(dto.TrCallRecordDto, data.CaseSerial, taskId, cancellationToken);
@@ -729,8 +730,9 @@ namespace DataSharing.Application.Receivers
             var url = configProvince.HuiJu + "submit_case_record";
             #endregion
 
+            var startTime = dto.Order == null ? dto.TrCallRecordDto.BeginIvrTime : dto.Order.StartTime;
             //将待推送数据写入待推送表
-            var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonData, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
+            var taskId = await InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonData, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: startTime, cancellationToken: cancellationToken);
 
             //本地保存通话记录数据
             await InitTelCallData(dto.TrCallRecordDto, data.CaseSerial, taskId, cancellationToken);
@@ -2173,7 +2175,7 @@ namespace DataSharing.Application.Receivers
             EPlatformSource platformSource = EPlatformSource.Province,
             EPathType pathType = EPathType.Other,
             int taskPriority = 0,
-            DateTime? GenerationTime=null,
+            DateTime? GenerationTime = null,
             List<FileJson>? fileJson = null,
             CancellationToken cancellationToken = default)
         {
@@ -2187,7 +2189,7 @@ namespace DataSharing.Application.Receivers
                 PlatformSource = platformSource,
                 FileJson = fileJson,
                 Request = request,
-                GenerationTime= GenerationTime,
+                GenerationTime = GenerationTime,
                 PathType = pathType
             };
             return await _dsSendTaskRepository.AddAsync(dsSendTask, cancellationToken);

+ 1 - 1
src/DataSharing/Province/PusherProviderService.cs

@@ -88,7 +88,7 @@ namespace DataSharing.Province
                 return;
 
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            if (configProvince.SendTaskStartTime > dto.GenerationTime)
+            if (configProvince.SendTaskStartTime != null && configProvince.SendTaskStartTime > dto.GenerationTime)
             {
                 dto.IsSuccess = true;
                 await _dsSendTaskRepository.UpdateAsync(dto, cancellationToken);