publish

src/Hotline.Api/Controllers/OrderController.cs

@@ -130,6 +130,9 @@ public class OrderController : BaseController
         orderPublished.ArrangeTitle = dto.ArrangeTitle;
         orderPublished.ArrangeContent = dto.ArrangeContent;
         orderPublished.ArrangeOpinion = dto.ArrangeOpinion;
+        orderPublished.ProPublishState = dto.ProPublishState;
+        orderPublished.FeedBackPhone = dto.FeedBackPhone;
+        orderPublished.NoPubReason = dto.NoPubReason;
         string id = await _orderPublishedRepository.AddAsync(orderPublished);
         //新增回访信息
         var visitedDetail = new List<OrderVisitedDetail>();
@@ -149,6 +152,18 @@ public class OrderController : BaseController
             visitedDetail.Add(orgDetail);
         }
         await _mediator.Publish(new AddVisitNotify(visitedDetail), HttpContext.RequestAborted);
+
+        //TODO 中国政府网
+        if (order.SourceChannel == "ZGZFW")
+        {
+
+        }
+        //TODO 省政民互动
+        if (order.SourceChannel == "ZMHD")
+        {
+
+        }
+
     }
 
     /// <summary>
@@ -167,7 +182,7 @@ public class OrderController : BaseController
         if (order is null)
             throw UserFriendlyException.SameMessage("未知工单，无法发布");
 
-        var res = new PublishOrderPageBaseDto() { Source = order.Source, OrderTitle = order.Title, Content = order.Content, ActualOpinion = order.ActualOpinion };
+        var res = new PublishOrderPageBaseDto() { SourceChannel = order.SourceChannel, OrderTitle = order.Title, Content = order.Content, ActualOpinion = order.ActualOpinion };
         var (idName,idNames)  = await _workflowDomainService.GetNoVisiteOrgsAsync(order.WorkflowId, HttpContext.RequestAborted);
         res.ActualHandleOrgName = idName;
         res.idNames = idNames.ToList();

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -341,7 +341,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 来源 0：热线平台  1：省平台 2：110
         /// </summary>
-        public ESource Source { get; set; }
+        public string SourceChannel { get; set; }
 
         /// <summary>
         /// 工单标题
@@ -381,7 +381,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 发布范围
         /// </summary>
-        public EPublishState PublishState { get; set; }
+        public bool PublishState { get; set; }
 
         /// <summary>
         /// 整理标题
@@ -402,5 +402,23 @@ namespace Hotline.Share.Dtos.Order
         /// 需回访部门
         /// </summary>
         public List<IdName> IdNames { get; set; }
+
+        #region 省工单使用
+
+        /// <summary>
+        /// 省是否公开
+        /// </summary>
+        public bool? ProPublishState { get; set; }
+        /// <summary>
+        /// 反馈人电话
+        /// </summary>
+        public string? FeedBackPhone { get; set; }
+
+        /// <summary>
+        /// 不公开原因
+        /// </summary>
+        public string? NoPubReason { get; set; }
+
+        #endregion
     }
 }

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -100,7 +100,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 发布范围
         /// </summary>
-        public EPublishState? PubRange { get; set; }
+        public bool? PubRange { get; set; }
 
         /// <summary>
         /// 受理类型

src/Hotline/Orders/OrderPublished.cs

@@ -17,7 +17,7 @@ public class OrderPublished : CreationEntity
     /// <summary>
     /// 发布范围
     /// </summary>
-    public EPublishState PublishState { get; set; }
+    public bool PublishState { get; set; }
 
     /// <summary>
     /// 整理标题
@@ -40,4 +40,24 @@ public class OrderPublished : CreationEntity
     /// </summary>
     [Navigate(NavigateType.OneToOne, nameof(Id))]
     public Order Order { get; set; }
+
+    #region 省工单使用字段
+
+    /// <summary>
+    /// 省是否公开
+    /// </summary>
+    public bool? ProPublishState { get; set; }
+
+    /// <summary>
+    /// 反馈电话
+    /// </summary>
+    [SugarColumn(IsNullable = true)]
+    public string FeedBackPhone { get; set; }
+
+    /// <summary>
+    /// 不公开原因
+    /// </summary>
+    [SugarColumn(IsNullable = true)]
+    public string NoPubReason { get; set; }
+    #endregion
 }