src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -1048,6 +1048,9 @@ namespace DataSharing.Application.Receivers
 
             if (dto.Order.IsProvince && dto.Order.Source == ESource.ProvinceStraight)
             {
+                if (dto.Order.RealCommunicationMode == null)
+                    dto.Order.RealCommunicationMode = ERealCommunicationMode.Phone;
+
                 var validator = new CaseResultReceiveValidator();
                 var validResult = await validator.ValidateAsync(dto, cancellationToken);
                 if (!validResult.IsValid)

src/DataSharing.Host/Controllers/ProvinceController.cs

@@ -9,6 +9,7 @@ using DotNetCore.CAP;
 using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
 using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.Order;
+using Hotline.Share.Enums.Order;
 using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
@@ -530,7 +531,8 @@ namespace DataSharing.Host.Controllers
                 CancelOrderDto cancelOrder = new()
                 {
                     Opinion = dto.RevokeReasion,
-                    ProvinceNo = dto.CaseSerial
+                    ProvinceNo = dto.CaseSerial,
+                    Source= "province"
                 };
                 //向业务系统推送消息
                 await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderRevoke, cancelOrder, cancellationToken: HttpContext.RequestAborted);
@@ -877,7 +879,7 @@ namespace DataSharing.Host.Controllers
             }
             //  @params = "{ \"token\": \"\", \"paras\":{ \"CaseSerial\":\"RGDH99511500240304000100\", \"MaterialType\":\"10\", \"CliengGuid\":\"91541fea-e1a5-4798-bc43-b25cc77ec6b7\", \"AreaCode\":\"511500\"} }";
             // 解析附件信息
-            var vmCaseMaterialInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetCaseMaterialInfoRequest>(@params);
+            var vmCaseMaterialInfo = System.Text.Json.JsonSerializer.Deserialize<GetCaseMaterialInfoRequest>(@params);//Newtonsoft.Json.JsonConvert.DeserializeObject<GetCaseMaterialInfoRequest>(@params);
             if (vmCaseMaterialInfo is null || vmCaseMaterialInfo.paras is null)
             {
                 return OpenResponse.Ok(GetDataBaseReponse<string>.Failed("数据解析失败"));
@@ -943,7 +945,8 @@ namespace DataSharing.Host.Controllers
                             AddOrderDto addOrder = new()
                             {
                                 ProvinceNo = tmpCaseMaterialInfo.CaseSerial,
-                                Files = listFiles
+                                Files = listFiles,
+                                Source= ESource.ProvinceStraight
                             };
                             // await _capPublisher.PublishAsync(DataSharing.Share.Mq.EventNames.SharingOrderCreation, addOrder, cancellationToken: HttpContext.RequestAborted);
                             //  var result = await _hotlineClient.ReceiveOrderAsync(addOrder, HttpContext.RequestAborted);