修改省协同编号

src/DataSharing.Application/Mappers/MapperConfigs.cs

@@ -86,7 +86,7 @@ namespace DataSharing.Application.Mappers
 
             //服务工单交办处理过程
             config.ForType<OrderFlowDto, GetCaseProcessReceiveInfo>()
-           .Map(d => d.CaseSerial, x => x.Order.ProvinceNo)
+           .Map(d => d.CaseSerial, x => x.Order.ReceiveProvinceNo)
             .Map(d => d.DeptName, x => x.WorkflowTrace.HandlerOrgName)
             .Map(d => d.ProcessTime, x => x.WorkflowTrace.HandleTime)
             .Map(d => d.ProcessName, x => x.WorkflowTrace.HandlerName)
@@ -107,7 +107,7 @@ namespace DataSharing.Application.Mappers
 
             //服务工单交办评价
             config.ForType<PublishVisitDto, GetVisitInfoReceiveInfo>()
-            .Map(d => d.CaseSerial, x => x.Order.ProvinceNo)
+            .Map(d => d.CaseSerial, x => x.Order.ReceiveProvinceNo)
             .Map(d => d.SubjectResultSatify, x => x.SubjectResultSatifyCode)
             ;
 
@@ -119,14 +119,14 @@ namespace DataSharing.Application.Mappers
             .Map(d => d.ApplyTime, x => x.ApplyDelayTime)
             .Map(d => d.ApplyOuname, x => x.ApplyOrgName)
             .Map(d => d.ApplyReason, x => x.DelayReason)
-            .Map(d => d.CaseSerial, x => x.Order.ProvinceNo)
+            .Map(d => d.CaseSerial, x => x.Order.ReceiveProvinceNo)
             .Map(d => d.AreaCode, x => x.Order.AreaCode.Length > 6 ? x.Order.AreaCode.Substring(0, 6) : x.Order.AreaCode)
             ;
 
             //接收
             //工单交办
             config.ForType<ReceiveCaseInfoModel, AddOrderDto>()
-           .Map(d => d.ProvinceNo, x => x.CaseSerial)
+           .Map(d => d.ReceiveProvinceNo, x => x.CaseSerial)
            .Map(d => d.Title, x => x.CaseTitle)
            //.Map(d => d.AcceptorName, x => x.CaseRegister)
            //.Map(d => d.AcceptorStaffNo, x => x.CaseRegisterNo)
@@ -168,9 +168,9 @@ namespace DataSharing.Application.Mappers
            .Map(d => d.HandleTimeLong, x => x.Order.ProcessType == Hotline.Share.Enums.Order.EProcessType.Zhiban ? x.Order.CreationTimeHandleDurationWorkday : x.Order.CenterToOrgHandleDurationWorkday)
              ;
 
-            ///服务工单交办处理结果
+            //服务工单交办处理结果
             config.ForType<OrderDto, GetCaseResultReceiveInfo>()
-           .Map(d => d.CaseSerial, x => x.ProvinceNo)
+           .Map(d => d.CaseSerial, x => x.ReceiveProvinceNo)
            .Map(d => d.DeptName, x => x.ActualHandleOrgName)
            .Map(d => d.FinishTime, x => x.FiledTime)
            .Map(d => d.FinishName, x => x.ActualHandlerName)
@@ -187,7 +187,7 @@ namespace DataSharing.Application.Mappers
            .Map(d => d.HandleTimeLong, x => x.HandleDurationWorkday)
             ;
 
-            ///政民互动提交公开
+            //政民互动提交公开
             config.ForType<PublicOrderProvinceZmhdDto, ZmhdCaseInfoPublicInfo>()
            .Map(d => d.CaseSerial, x => x.ProvinceNo)
            .Map(d => d.AnswerTime, x => x.AnswerTime)
@@ -232,7 +232,7 @@ namespace DataSharing.Application.Mappers
 
             //发起甄别
             config.ForType<PublishScreenDto, ScreenCaseInfoSendInfo>()
-            .Map(d => d.CaseSerial, x => x.Order.ProvinceNo)
+            .Map(d => d.CaseSerial, x => x.Order.ReceiveProvinceNo)
             .Map(d => d.AreaCode, x => x.Order.AreaCode.Length > 6 ? x.Order.AreaCode.Substring(0, 6) : x.Order.AreaCode)
            .Map(d => d.ApplyName, x => x.Screen.CreatorName)
            .Map(d => d.ApplyTime, x => x.Screen.CreationTime)
@@ -273,7 +273,7 @@ namespace DataSharing.Application.Mappers
             .Map(d => d.BackType, x => x.SendBack.Handle)
             .Map(d => d.DealDept, x => x.SendBack.CreatorOrgName)
            .Map(d => d.DealName, x => x.SendBack.CreatorName)
-           .Map(d => d.CaseSerial, x => x.Order.ProvinceNo)
+           .Map(d => d.CaseSerial, x => x.Order.ReceiveProvinceNo)
            .Map(d => d.AreaCode, x => x.Order.AreaCode.Length > 6 ? x.Order.AreaCode.Substring(0, 6) : x.Order.AreaCode)
            .Map(d => d.ApplyTime, x => x.SendBack.CreationTime)
            .Map(d => d.BackReason, x => string.IsNullOrEmpty(x.SendBack.AuditOpinion) ? x.SendBack.Content : x.SendBack.AuditOpinion)

src/DataSharing/DataSharing.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="11.6.0" />
-    <PackageReference Include="Hotline.Share" Version="1.0.104" />
+    <PackageReference Include="Hotline.Share" Version="1.0.105" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="Quartz.Jobs" Version="3.8.0" />
     <PackageReference Include="RestSharp" Version="110.2.0" />

src/DataSharing/Province/ProvinceService.cs

@@ -163,7 +163,7 @@ namespace DataSharing.Province
                jsonData, JsonSerializer.Serialize(data, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions), 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);
+                        await FileDataAsync(dto.SendBack.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken: cancellationToken);
                     }
                 }
             }
@@ -198,7 +198,7 @@ namespace DataSharing.Province
             #endregion
 
             //将待推送数据写入待推送表
-            await _initPushDataService.InitDsSendTaskProvinceOther("SendSuperviseProcessInfo", "send_supervise_process_info", dto.Order.ProvinceNo,
+            await _initPushDataService.InitDsSendTaskProvinceOther("SendSuperviseProcessInfo", "send_supervise_process_info", dto.Order.ReceiveProvinceNo,
              jsonData, JsonSerializer.Serialize(data, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions), pathType: EPathType.XieTong,
              generationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
         }
@@ -231,12 +231,12 @@ namespace DataSharing.Province
             #endregion
 
             //将待推送数据写入待推送表
-            await _initPushDataService.InitDsSendTaskProvinceOther("SendSuperviseResultInfo", "send_supervise_result_info", dto.Order.ProvinceNo,
+            await _initPushDataService.InitDsSendTaskProvinceOther("SendSuperviseResultInfo", "send_supervise_result_info", dto.Order.ReceiveProvinceNo,
              jsonData, JsonSerializer.Serialize(data, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions), pathType: EPathType.XieTong,
              generationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
 
             //处理附件
-            await FileDataAsync(dto.Supervise.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Supervise, dto.Order.AreaCode, cancellationToken);
+            await FileDataAsync(dto.Supervise.FileJson, dto.Order.ReceiveProvinceNo, data.CliengGuid, EMaterialType.Supervise, dto.Order.AreaCode, cancellationToken);
 
         }
 
@@ -279,7 +279,7 @@ namespace DataSharing.Province
             generationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
 
             //处理附件
-            await FileDataAsync(dto.Screen.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken: cancellationToken);
+            await FileDataAsync(dto.Screen.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken: cancellationToken);
 
         }
 
@@ -362,7 +362,7 @@ namespace DataSharing.Province
                 await _initPushDataService.InitDsSendTaskSubmitCaseInfo(data.CaseSerial, jsonData, data, pushdto.Order.StartTime, cancellationToken);
 
                 //处理附件
-                await FileDataAsync(dto.FileJson, dto.ProvinceNo, data.CliengGuid, EMaterialType.Acceptance, data.AreaCode, cancellationToken);
+                await FileDataAsync(dto.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Acceptance, data.AreaCode, cancellationToken);
             }
 
             //推送当前办理信息
@@ -478,7 +478,7 @@ namespace DataSharing.Province
                 if (dto.Order.ActualHandleStepName == "话务部")
                 {
                     //处理附件
-                    await FileDataAsync(dto.Order.FileJson, dto.Order.ProvinceNo, submitCaseInfo.CliengGuid, EMaterialType.Acceptance, submitCaseInfo.AreaCode, cancellationToken);
+                    await FileDataAsync(dto.Order.FileJson, submitCaseInfo.CaseSerial, submitCaseInfo.CliengGuid, EMaterialType.Acceptance, submitCaseInfo.AreaCode, cancellationToken);
                 }
             }
         }
@@ -976,7 +976,7 @@ namespace DataSharing.Province
          generationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
 
 
-            await FileDataAsync(dto.Special.FileJson, dto.Order.ProvinceNo, dsRevoke.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
+            await FileDataAsync(dto.Special.FileJson, dsRevoke.CaseSerial, dsRevoke.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
         }
 
         /// <summary>
@@ -1012,7 +1012,7 @@ namespace DataSharing.Province
        generationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
 
             //处理附件
-            await FileDataAsync(dto.Urge.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
+            await FileDataAsync(dto.Urge.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
 
         }
 
@@ -1094,7 +1094,7 @@ namespace DataSharing.Province
        generationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
 
                 //处理附件
-                await FileDataAsync(dto.FileJsons, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Result, dto.Order.AreaCode, cancellationToken);
+                await FileDataAsync(dto.FileJsons, data.CaseSerial, data.CliengGuid, EMaterialType.Result, dto.Order.AreaCode, cancellationToken);
                 #endregion
             }
 
@@ -1320,7 +1320,7 @@ namespace DataSharing.Province
 
 
             //处理附件
-            await FileDataAsync(dto.FileJson, dto.ProvinceNo, sendCaseInfoData.CliengGuid, EMaterialType.Acceptance, sendCaseInfoData.AreaCode, cancellationToken);
+            await FileDataAsync(dto.FileJson, sendCaseInfo.CaseSerial, sendCaseInfoData.CliengGuid, EMaterialType.Acceptance, sendCaseInfoData.AreaCode, cancellationToken);
 
         }
         #endregion
@@ -1544,7 +1544,7 @@ namespace DataSharing.Province
        generationTime: dto.Order.StartTime, cancellationToken: cancellationToken);
 
                 //处理附件
-                await FileDataAsync(dto.WorkflowTrace.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
+                await FileDataAsync(dto.WorkflowTrace.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
             }
             else  //如果不是省上派下来的工单
             {
@@ -1567,7 +1567,7 @@ namespace DataSharing.Province
                 //将待推送数据写入待推送表
                 await _initPushDataService.InitDsSendTaskSubmitCaseProcess(data.CaseSerial, jsonDataSubmitCaseProcessInfo, data, dto.Order.StartTime, cancellationToken);
                 //处理附件
-                await FileDataAsync(dto.WorkflowTrace.FileJson, dto.Order.ProvinceNo, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
+                await FileDataAsync(dto.WorkflowTrace.FileJson, data.CaseSerial, data.CliengGuid, EMaterialType.Process, dto.Order.AreaCode, cancellationToken);
             }
 
             ////这里判断是否需要往其他平台推送数据