Merge branch 'dev' of http://git.12345lm.cn/Fengwo/hotline into dev

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -708,6 +708,7 @@ namespace Hotline.Application.Subscribers
                 data.IsSuccess = dto.IsSuccess;
                 data.SendTimes = dto.SendTimes;
                 data.Result = dto.Result;
+                data.NewCode = dto.NewCode;
                 await _transpondCityRawDataRepository.UpdateAsync(data, cancellationToken);
             }
         }

src/Hotline.Share/Dtos/OrderTranspond/TranspondCityRawDataDto.cs

@@ -5,7 +5,7 @@ namespace Hotline.Share.Dtos.OrderTranspond
     public class TranspondCityRawDataDto
     {
         /// <summary>
-        /// 工单编号
+        /// 本地工单编号
         /// </summary>
         public string OrderCode { get; set; }
 
@@ -38,5 +38,16 @@ namespace Hotline.Share.Dtos.OrderTranspond
         /// 转出或者转入
         /// </summary>
         public ETranspondDirection Direction { get; set; }
+
+        /// <summary>
+        /// 接收方工单编号
+        /// </summary>
+        public string NewCode { get; set; }
+
+        /// <summary>
+        /// 市州办理意见
+        /// </summary>
+        public string ActualOpinion { get; set; }
+
     }
 }

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.77</Version>
+    <Version>1.0.78</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Hotline.Share/Mq/EventNames.Share.cs

@@ -95,6 +95,11 @@
         /// </summary>
         public const string SharingOrderReceiveTranspondCity = "sharing.order.receive.transpond.city";
 
+        /// <summary>
+        /// 市州互转 接收办理结果
+        /// </summary>
+        public const string SharingOrderReceiveHandleOpinionTranspondCity = "sharing.order.receive.handle.opinion.transpond.city";
+
         /// <summary>
         /// 接受省上上传附件
         /// </summary>

src/Hotline/OrderTranspond/TranspondCityRawData.cs

@@ -47,5 +47,17 @@ namespace Hotline.OrderTranspond
         /// </summary>
         [SugarColumn(ColumnDescription = "转出或者转入")]
         public ETranspondDirection Direction { get; set; }
+
+        /// <summary>
+        /// 接收方工单编号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接收方工单编号")]
+        public string? NewCode { get; set; }
+
+        /// <summary>
+        /// 市州办理意见
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接收方工单编号")]
+        public string? ActualOpinion { get; set; }
     }
 }