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

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -897,6 +897,18 @@ namespace Hotline.Application.Subscribers
 
             }
         }
+
+        /// <summary>
+        ///  随手拍网格员、回复办理结果
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        [CapSubscribe(EventNames.TianQueReceiverOpinion)]
+        public async Task TianQueReceiverOpinion(TianQueReceiverOpinionDto dto, CancellationToken cancellationToken)
+        {
+            //todo
+        }
     }
 
 }

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/TianQueReceiverOpinionDto.cs

@@ -0,0 +1,107 @@
+using Hotline.Share.Dtos.File;
+
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    public class TianQueReceiverOpinionDto
+    {
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string No { get; set; }
+
+        /// <summary>
+        /// 办理时间
+        /// </summary>
+        public DateTime? HandleTime { get; set; }
+
+        /// <summary>
+        /// 办理人
+        /// </summary>
+        public string? HandleUser { get; set; }
+
+        /// <summary>
+        /// 办理部门
+        /// </summary>
+        public string? HandleOrgName { get; set; }
+
+        /// <summary>
+        /// 办理状态 1，7：流转 2：办结 3：退回 4：网格员签收 5：消息推送 6: 超时自动退单
+        /// </summary>
+        public string? HandleType { get; set; }
+
+        /// <summary>
+        /// 是否属实
+        /// </summary>
+        public bool ISTrue { get; set; }
+
+        /// <summary>
+        /// 是否重复 
+        /// </summary>
+        public bool IsRepeat { get; set; }
+
+        /// <summary>
+        /// 重复工单号
+        /// </summary>
+        public string? RepeatNo { get; set; }
+
+        /// <summary>
+        /// 是否隐患
+        /// </summary>
+        public bool IsHiddenDanger { get; set; }
+
+        /// <summary>
+        /// 是否重大隐患 
+        /// </summary>
+        public bool IsMajorHidden { get; set; }
+
+        /// <summary>
+        /// 网格员姓名
+        /// </summary>
+        public string? MemberName { get; set; }
+
+        /// <summary>
+        /// 网格员电话
+        /// </summary>
+        public string? MemberMobile { get; set; }
+
+        /// <summary>
+        /// 网格化诉求编号
+        /// </summary>
+        public string? AppealNumber { get; set; }
+
+        /// <summary>
+        /// 办理内容
+        /// </summary>
+        public string? ReplyContent { get; set; }
+
+        /// <summary>
+        /// 区域id
+        /// </summary>
+        public string? AreaId { get; set; }
+
+        /// <summary>
+        /// 区域名称
+        /// </summary>
+        public string? AreaName { get; set; }
+
+        /// <summary>
+        /// 区域全称
+        /// </summary>
+        public string? AreaFullName { get; set; }
+
+        /// <summary>
+        /// 区域编码
+        /// </summary>
+        public string? DepartmentNo { get; set; }
+
+        /// <summary>
+        /// 区域上级Id
+        /// </summary>
+        public string? ParentAreaId { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public List<FileDto> FileDtos { get; set; }
+    }
+}

src/Hotline.Share/Enums/Order/ESource.cs

@@ -74,6 +74,11 @@ public enum ESource
     /// </summary>
     WLLZ = 404,
 
+    /// <summary>
+    /// 宜办事
+    /// </summary>
+    YBS = 405,
+
     #region 导入类型（>=500  <530为导入来源）
     /// <summary>
     /// 麻辣社区导入

src/Hotline.Share/Hotline.Share.csproj

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

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

@@ -104,5 +104,10 @@
         /// 接受省上上传附件
         /// </summary>
         public const string SharingFileInfo = "sharing.file.info";
+
+        /// <summary>
+        /// 接收天阙办理结果
+        /// </summary>
+        public const string TianQueReceiverOpinion = "tian.que.receiver.opinion";
     }
 }