修改办理意见接收

src/DataSharing.Host/Controllers/CityDataExchangeController.cs

@@ -188,7 +188,7 @@ namespace DataSharing.Host.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("city_exchange_add_opinion")]
-        public async Task<OpenResponse> CityExchangeAddOpinion([FromBody] OrderDto dto)
+        public async Task<OpenResponse> CityExchangeAddOpinion([FromBody] CityExchangeAddOpinionDto dto)
         {
             // 验证
             if (dto is null)
@@ -197,7 +197,7 @@ namespace DataSharing.Host.Controllers
             //写入原始数据表
             var data = new DsReceiveDataExchangeData()
             {
-                ExternalId = dto.ExternalId,
+                ExternalId = dto.OrderId,
                 ServiceInterface = "city_exchange_add_opinion",
                 PlatformsName = dto.TranspondCityName,// _sessionContext.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto)
@@ -207,7 +207,7 @@ namespace DataSharing.Host.Controllers
             //写入对外展示表数据
             DsReceiveHandleData dsReceive = new()
             {
-                OrderNo = dto.ExternalId,
+                OrderNo = dto.OrderId,
                 Source = "市州互转",
                 PlatformsName = dto.TranspondCityName,// 、、_sessionContext.PlatformSourceName,
                 ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto),
@@ -218,7 +218,7 @@ namespace DataSharing.Host.Controllers
 
             TranspondCityOrderResultDto transpondCityOrderResultDto = new()
             {
-                No = dto.ExternalId,
+                No = dto.OrderId,
                 Opinion = dto.ActualOpinion
             };
             await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.SharingOrderReceiveHandleOpinionTranspondCity, transpondCityOrderResultDto, cancellationToken: HttpContext.RequestAborted);

src/DataSharing.Share/Dtos/CityStateDataExchange/CityExchangeAddOpinionDto.cs

@@ -0,0 +1,25 @@
+namespace DataSharing.Share.Dtos.CityStateDataExchange
+{
+    public class CityExchangeAddOpinionDto
+    {
+        /// <summary>
+        /// 编号或者id
+        /// </summary>
+        public string OrderId { get; set; }
+
+        /// <summary>
+        /// 市州名称
+        /// </summary>
+        public string TranspondCityName { get; set; }
+
+        /// <summary>
+        /// 实际办理意见
+        /// </summary>
+        public string ActualOpinion { get; set; }
+
+        /// <summary>
+        /// 归档意见
+        /// </summary>
+        public string FileOpinion { get; set; }
+    }
+}

src/DataSharing/CityStateDataExchange/CityStateDataExchangeService.cs

@@ -1,6 +1,7 @@
 using DataSharing.Province;
 using DataSharing.RawData;
 using DataSharing.SendTask;
+using DataSharing.Share.Dtos.CityStateDataExchange;
 using DataSharing.Share.Enums;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.Order;
@@ -129,8 +130,15 @@ namespace DataSharing.CityStateDataExchange
             {
                 dto.TranspondCityName = "泸州12345";
             }
-            
-            var request = JsonSerializer.Serialize(dto, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+            CityExchangeAddOpinionDto addOpinionDto = new CityExchangeAddOpinionDto
+            {
+                OrderId=dto.ExternalId,
+                TranspondCityName=dto.TranspondCityName,
+                ActualOpinion=dto.ActualOpinion,
+                FileOpinion = dto.FileOpinion
+            };
+
+            var request = JsonSerializer.Serialize(addOpinionDto);
             await _initPushDataService.InitDsSendTaskOtherPlatforms(userInfo.PlatformSource, config.PushOpinion, dto.No,
                 request, request, EPlatformSource.CityDataExchange, cancellationToken: cancellationToken);