src/DataSharing.Application/DataSharing.Application.csproj

@@ -6,6 +6,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Validators\**" />
+    <EmbeddedResource Remove="Validators\**" />
+    <None Remove="Validators\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Polly.Core" Version="8.2.0" />
   </ItemGroup>
@@ -17,9 +23,4 @@
     <ProjectReference Include="..\DataSharing.ZiGong\DataSharing.ZiGong.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Validators\HuiJu\" />
-    <Folder Include="Validators\XieTong\" />
-  </ItemGroup>
-
 </Project>

src/DataSharing.YiBin/YiBinSendTaskDataService.cs

@@ -1,5 +1,4 @@
 using DataSharing.CityStateDataExchange;
-using DataSharing.Province;
 using DataSharing.SendTask;
 using DataSharing.SendTask.OtherPlatforms;
 using DataSharing.YiBin.Enterprise;

src/DataSharing.ZiGong/ZiGongSendTaskDataService.cs

@@ -1,5 +1,4 @@
 using DataSharing.CityStateDataExchange;
-using DataSharing.Province;
 using DataSharing.SendTask;
 using DataSharing.SendTask.OtherPlatforms;
 using Microsoft.Extensions.Logging;

src/DataSharing/Province/ProvinceService.cs

@@ -368,7 +368,7 @@ namespace DataSharing.Province
             if (pushdto.TrCallRecordDto is not null)
             {
                 //如果推送工单的时候判断通话记录是否是未接，并且是否已经上传，如果没有咋补再次推送通话记录
-                var tellCall = await _dsTelCallRepository.AnyAsync(p => p.CallId == pushdto.TrCallRecordDto.CallAccept, cancellationToken);
+                var tellCall = await _dsTelCallRepository.AnyAsync(p => p.CallId == pushdto.TrCallRecordDto.OtherAccept, cancellationToken);
                 if (pushdto.TrCallRecordDto.OnState == EOnState.NoOn && !tellCall)
                     return;
 
@@ -390,7 +390,6 @@ namespace DataSharing.Province
                 requestCall.SetData(new List<SubmitCaseRecordInfo>() { dataCall });
                 var jsonDataCall = requestCall.ToString();
                 jsonDataCall = jsonDataCall.Replace("0001-01-01 00:00:00", "");
-                var urlCall = configProvince.HuiJu + "submit_case_record";
                 //将待推送数据写入待推送表
                 // var taskId = await _initPushDataService.InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonDataCall, dataCall.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: pushdto.Order.StartTime, cancellationToken: cancellationToken);
                 var taskId = await _initPushDataService.InitDsSendTaskSubmitCaseRecord(dataCall.CaseSerial, jsonDataCall, dataCall, pushdto.Order.StartTime, cancellationToken);
@@ -732,7 +731,7 @@ namespace DataSharing.Province
             if (dto.TrCallRecordDto is not null)
             {
                 //如果推送工单的时候判断通话记录是否是未接，并且是否已经上传，如果没有咋补再次推送通话记录
-                var tellCall = await _dsTelCallRepository.AnyAsync(p => p.CallId == dto.TrCallRecordDto.CallAccept, cancellationToken);
+                var tellCall = await _dsTelCallRepository.AnyAsync(p => p.CallId == dto.TrCallRecordDto.OtherAccept, cancellationToken);
                 if (dto.TrCallRecordDto.OnState == EOnState.NoOn && !tellCall)
                     return;
 
@@ -754,7 +753,6 @@ namespace DataSharing.Province
                 requestCall.SetData(new List<SubmitCaseRecordInfo>() { dataCall });
                 var jsonDataCall = requestCall.ToString();
                 jsonDataCall = jsonDataCall.Replace("0001-01-01 00:00:00", "");
-                var urlCall = configProvince.HuiJu + "submit_case_record";
                 //将待推送数据写入待推送表
                 //var taskId = await _initPushDataService.InitPushDataAsync("SubmitCaseRecord", "submit_case_record", jsonDataCall, dataCall.CaseSerial, pathType: EPathType.HuiJu, taskPriority: 20, GenerationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
                 var taskId = await _initPushDataService.InitDsSendTaskSubmitCaseRecord(dataCall.CaseSerial, jsonDataCall, dataCall, dto.Order.StartTime, cancellationToken);
@@ -840,7 +838,7 @@ namespace DataSharing.Province
         public async Task SubmitCaseRecordOrderAsync(PublishCallRecrodDto dto, CancellationToken cancellationToken)
         {
             //如果推送工单的时候判断通话记录是否是未接，并且是否已经上传，如果没有咋补再次推送通话记录
-            var tellCall = await _dsTelCallRepository.AnyAsync(p => p.CallId == dto.TrCallRecordDto.CallAccept, cancellationToken);
+            var tellCall = await _dsTelCallRepository.AnyAsync(p => p.CallId == dto.TrCallRecordDto.OtherAccept, cancellationToken);
             if (dto.TrCallRecordDto.OnState == EOnState.NoOn && !tellCall)
                 return;
 
@@ -2014,13 +2012,13 @@ namespace DataSharing.Province
         /// <returns></returns>
         private async Task InitTelCallData(TrCallDto dto, string ProvinceNo, string taskId, CancellationToken cancellationToken)
         {
-            var tellCall = await _dsTelCallRepository.GetAsync(p => p.CallId == dto.CallAccept, cancellationToken);
+            var tellCall = await _dsTelCallRepository.GetAsync(p => p.CallId == dto.OtherAccept, cancellationToken);
             if (tellCall != null)
             {
                 //修改
                 _mapper.Map(dto, tellCall);
                 tellCall.ProvinceNo = ProvinceNo;
-                tellCall.CallId = dto.CallAccept;
+                tellCall.CallId = dto.OtherAccept;
                 tellCall.TaskId = taskId;
                 await _dsTelCallRepository.UpdateAsync(tellCall, cancellationToken);
             }
@@ -2030,7 +2028,7 @@ namespace DataSharing.Province
                 tellCall = new DsTelCall();
                 tellCall = _mapper.Map<DsTelCall>(dto);
                 tellCall.ProvinceNo = ProvinceNo;
-                tellCall.CallId = dto.CallAccept;
+                tellCall.CallId = dto.OtherAccept;
                 tellCall.TaskId = taskId;
                 await _dsTelCallRepository.AddAsync(tellCall, cancellationToken);
             }

src/DataSharing/Province/SendTask/TaskProvinceOtherJob.cs

@@ -163,9 +163,9 @@ namespace DataSharing.Province.SendTask
                                 }
                                 else
                                     sendTaskData.IsSuccess = ESendTaskState.PushFail;
-                                
+
                                 await _sendTaskProvinceOtherRepository.UpdateAsync(sendTaskData, context.CancellationToken);
-                                
+
                             }
                             #endregion
 

src/DataSharing/Province/SendTask/TaskSubmitCaseInfoJob.cs

@@ -132,6 +132,7 @@ namespace DataSharing.Province.SendTask
                                     isError = true;
                             }
 
+                            #region 处理待推送表数据
                             //处理待推送数据
                             if (isError)
                             {
@@ -153,7 +154,9 @@ namespace DataSharing.Province.SendTask
                                 //删除
                                 await _waitSendTaskSubmitCaseInfoRepository.RemoveAsync(item, cancellationToken: context.CancellationToken);
                             }
+                            #endregion
 
+                            #region 处理数据推送主表数据
                             //查询主表
                             var sendData = await _sendTaskSubmitCaseInfoRepository.GetAsync(p => p.Id == item.Id, context.CancellationToken);
                             if (sendData != null)
@@ -167,7 +170,9 @@ namespace DataSharing.Province.SendTask
                                 sendData.IsSuccess = isError == false ? ESendTaskState.PushSuccess : ESendTaskState.PushFail;
                                 await _sendTaskSubmitCaseInfoRepository.UpdateAsync(sendData, cancellationToken: context.CancellationToken);
                             }
+                            #endregion
 
+                            #region 新增推送明细
                             //新增明细
                             DsSendTaskDetailInfo dsSendTaskDetailInfo = new()
                             {
@@ -177,6 +182,19 @@ namespace DataSharing.Province.SendTask
                                 ResultErrorData = error,
                             };
                             await _sendTaskDetailInfoRepository.AddAsync(dsSendTaskDetailInfo, context.CancellationToken);
+                            #endregion
+
+                            #region 处理工单的上传时间，用于统计
+                            var order = await _orderSendRepository.GetAsync(p => p.ProvinceNo == item.ProvinceNo, context.CancellationToken);
+                            if (order != null)
+                            {
+                                if (order.FirstSendProvinceTime is null)
+                                    order.FirstSendProvinceTime = DateTime.Now;
+
+                                order.LastSendProvinceTime = DateTime.Now;
+                                await _orderSendRepository.UpdateAsync(order, context.CancellationToken);
+                            }
+                            #endregion
                         }
                     }
                 }

src/DataSharing/Province/SendTask/TaskSubmitCaseProcessJob.cs

@@ -4,7 +4,6 @@ using DataSharing.Share.Dtos.Province;
 using DataSharing.Share.Enums;
 using MapsterMapper;
 using Microsoft.Extensions.Logging;
-using Org.BouncyCastle.Ocsp;
 using Quartz;
 using System.Text.Json;
 using XF.Domain.Repository;

src/DataSharing/Province/SendTask/TaskSubmitCaseRecordJob.cs

@@ -7,7 +7,6 @@ using MapsterMapper;
 using Microsoft.Extensions.Logging;
 using Quartz;
 using System.Text.Json;
-using System.Threading;
 using XF.Domain.Repository;
 
 namespace DataSharing.Province.SendTask
@@ -131,6 +130,7 @@ namespace DataSharing.Province.SendTask
                                     isError = true;
                             }
 
+                            #region 处理待推送表数据
                             //处理待推送数据
                             if (isError)
                             {
@@ -152,7 +152,9 @@ namespace DataSharing.Province.SendTask
                                 //删除
                                 await _waitSendTaskSubmitCaseRecordRepository.RemoveAsync(item, cancellationToken: context.CancellationToken);
                             }
+                            #endregion
 
+                            #region 处理推送主表数据
                             //查询主表
                             var sendData = await _sendTaskSubmitCaseRecordRepository.GetAsync(p => p.Id == item.Id, context.CancellationToken);
                             if (sendData != null)
@@ -166,7 +168,9 @@ namespace DataSharing.Province.SendTask
                                 sendData.IsSuccess = isError == false ? ESendTaskState.PushSuccess : ESendTaskState.PushFail;
                                 await _sendTaskSubmitCaseRecordRepository.UpdateAsync(sendData, cancellationToken: context.CancellationToken);
                             }
+                            #endregion
 
+                            #region 新增推送明细
                             //新增明细
                             DsSendTaskDetailInfo dsSendTaskDetailInfo = new()
                             {
@@ -176,6 +180,20 @@ namespace DataSharing.Province.SendTask
                                 ResultErrorData = error,
                             };
                             await _sendTaskDetailInfoRepository.AddAsync(dsSendTaskDetailInfo, context.CancellationToken);
+                            #endregion
+
+                            #region 处理通话记录的上传时间，用于统计
+                            //处理通话记录的上传时间，用于统计
+                            var telCall = await _dsTelCallRepository.GetAsync(p => p.TaskId == item.Id, context.CancellationToken);
+                            if (telCall != null)
+                            {
+                                if (telCall.FirstSendProvinceTime is null)
+                                    telCall.FirstSendProvinceTime = DateTime.Now;
+
+                                telCall.LastSendProvinceTime = DateTime.Now;
+                                await _dsTelCallRepository.UpdateAsync(telCall, context.CancellationToken);
+                            }
+                            #endregion
                         }
                     }
                 }

src/DataSharing/Province/SendTask/TaskSubmitCaseTotalJob.cs

@@ -1,5 +1,4 @@
 using DataSharing.FwDataExchange;
-using DataSharing.Province;
 using DataSharing.SendTask;
 using DataSharing.Share.Consts;
 using DataSharing.Share.Dtos.HotlineSetting;

src/DataSharing/SendTask/BaseSendTask.cs

@@ -1,5 +1,4 @@
-using DataSharing.Share.Dtos;
-using DataSharing.Share.Enums;
+using DataSharing.Share.Enums;
 using SqlSugar;
 using XF.Domain.Repository;
 

src/DataSharing/SendTask/InitPushDataService.cs

@@ -136,7 +136,7 @@ namespace DataSharing.SendTask
                 RequestData = requestData,
                 GenerationTime = generationTime,
                 PathType = EPathType.HuiJu,
-                CaseId= requestData.CaseId
+                CaseId = requestData.CaseId
             };
             waitTask.Id = await _waitSendTaskSubmitCaseProcessRepository.AddAsync(waitTask, cancellationToken);
 

src/DataSharing/SendTask/SendTaskDefaults.cs

@@ -1,6 +0,0 @@
-namespace DataSharing.SendTask;
-
-public class SendTaskDefaults
-{
-    public const string SendTaskQueue = "send-task-queue";
-}