tangjiang 7 сар өмнө
parent
commit
61cc5bfbef

+ 1 - 2
src/DataSharing/Province/ProvinceService.cs

@@ -740,9 +740,8 @@ namespace DataSharing.Province
             jsonData = jsonData.Replace("0001-01-01 00:00:00", "");
             #endregion
 
-            var startTime = dto.BeginIvrTime;
             //将待推送数据写入待推送表
-            var taskId = await _initPushDataService.InitDsSendTaskSubmitCaseRecord(data.CaseSerial, jsonData, data, startTime, cancellationToken);
+            var taskId = await _initPushDataService.InitDsSendTaskSubmitCaseRecord(data.CaseSerial, dto.Id, jsonData, data, dto.EndTime, cancellationToken);
 
             //本地保存通话记录数据
             await InitTelFwCallData(dto, data.CaseSerial, taskId, cancellationToken);

+ 18 - 0
src/DataSharing/Province/SendTask/SubmitCaseRecord/DsSendTaskSubmitCaseRecord.cs

@@ -21,5 +21,23 @@ namespace DataSharing.Province.SendTask.SubmitCaseRecord
         /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(Id))]
         public DsWaitSendTaskSubmitCaseRecord WaitSendTaskSubmitCaseRecord { get; set; }
+
+        /// <summary>
+        /// 通话记录ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "通话记录ID", IsNullable = true)]
+        public string? CallId { get; set; }
+
+        /// <summary>
+        /// 呼叫方向 0:呼入;1:呼出
+        /// </summary>
+        [SugarColumn(ColumnDescription = "呼叫方向", IsNullable = true)]
+        public string? CallDirection { get; set; }
+
+        /// <summary>
+        /// 通话状态 1:接通;2:未接通
+        /// </summary>
+        [SugarColumn(ColumnDescription = "通话状态 1:接通;2:未接通", IsNullable = true)]
+        public string? OnState { get; set; }
     }
 }

+ 19 - 0
src/DataSharing/Province/SendTask/SubmitCaseRecord/DsWaitSendTaskSubmitCaseRecord.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using DataSharing.SendTask;
+using Hotline.Share.Enums.CallCenter;
 using SqlSugar;
 
 namespace DataSharing.Province.SendTask.SubmitCaseRecord
@@ -15,5 +16,23 @@ namespace DataSharing.Province.SendTask.SubmitCaseRecord
         /// </summary>
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true, ColumnDescription = "组装参数")]
         public Share.Dtos.Province.HuiJu.SubmitCaseRecordInfo RequestData { get; set; }
+
+        /// <summary>
+        /// 通话记录ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "通话记录ID", IsNullable = true)]
+        public string? CallId { get; set; }
+
+        /// <summary>
+        /// 呼叫方向 0:呼入;1:呼出
+        /// </summary>
+        [SugarColumn(ColumnDescription = "呼叫方向", IsNullable = true)]
+        public string? CallDirection { get; set; }
+
+        /// <summary>
+        /// 通话状态 1:接通;2:未接通
+        /// </summary>
+        [SugarColumn(ColumnDescription = "通话状态 1:接通;2:未接通", IsNullable = true)]
+        public string? OnState { get; set; }
     }
 }

+ 3 - 2
src/DataSharing/SendTask/IInitPushDataService.cs

@@ -31,13 +31,14 @@ namespace DataSharing.SendTask
         /// <summary>
         /// 组装电话记录
         /// </summary>
-        /// <param name="provinceNo"></param>
+        /// <param name="provinceNo">省编号</param>
+        ///  <param name="callId">通话记录ID</param>
         /// <param name="request">请求参数</param>
         /// <param name="requestData">请求参数</param>
         /// <param name="generationTime">生成时间(保存工单创建时间或者通话记录生成时间)</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<string> InitDsSendTaskSubmitCaseRecord(string provinceNo, string request, SubmitCaseRecordInfo requestData, DateTime? generationTime = null, CancellationToken cancellationToken = default);
+        Task<string> InitDsSendTaskSubmitCaseRecord(string provinceNo, string callId, string request, SubmitCaseRecordInfo requestData, DateTime? generationTime = null, CancellationToken cancellationToken = default)
 
         /// <summary>
         /// 组装服务工单处理结果

+ 7 - 2
src/DataSharing/SendTask/InitPushDataService.cs

@@ -7,6 +7,7 @@ using DataSharing.SendTask.OtherPlatforms;
 using DataSharing.Share.Dtos.Province.HuiJu;
 using DataSharing.Share.Enums;
 using Hotline.Share.Dtos.File;
+using Hotline.Share.Enums.CallCenter;
 using MapsterMapper;
 using Microsoft.Extensions.Logging;
 using XF.Domain.Dependency;
@@ -155,12 +156,13 @@ namespace DataSharing.SendTask
         /// 组装电话记录
         /// </summary>
         /// <param name="provinceNo">省编号</param>
+        ///  <param name="callId">通话记录ID</param>
         /// <param name="request">请求参数</param>
         /// <param name="requestData">请求参数</param>
         /// <param name="generationTime">生成时间(保存工单创建时间或者通话记录生成时间)</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task<string> InitDsSendTaskSubmitCaseRecord(string provinceNo, string request, SubmitCaseRecordInfo requestData,
+        public async Task<string> InitDsSendTaskSubmitCaseRecord(string provinceNo, string callId, string request, SubmitCaseRecordInfo requestData,
             DateTime? generationTime = null, CancellationToken cancellationToken = default)
         {
             //写入待推送表
@@ -173,7 +175,10 @@ namespace DataSharing.SendTask
                 Request = request,
                 RequestData = requestData,
                 GenerationTime = generationTime,
-                PathType = EPathType.HuiJu
+                PathType = EPathType.HuiJu,
+                CallId = callId,
+                CallDirection = requestData.IsPhoneCall == "1" ? "1" : "0",
+                OnState = requestData.PhoneStatus == "10" ? "1" : "2",
             };
             waitTask.Id = await _waitSendTaskSubmitCaseRecordRepository.AddAsync(waitTask, cancellationToken);
             var sendTask = _mapper.Map<DsSendTaskSubmitCaseRecord>(waitTask);