Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -239,6 +239,16 @@ public class OrderController : BaseController
         order.Publish(orderPublish.PublishState);
         await _orderRepository.UpdateAsync(order);
 
+
+        //TODO 推省上
+        try
+        {
+            var publishPublishOrder = _mapper.Map<PublishPublishOrderDto>(orderPublish);
+            publishPublishOrder.Order = _mapper.Map<OrderDto>(order);
+        }
+        catch {}
+
+
         var orderVisit = new OrderVisit();
         orderVisit.No = order.No;
         orderVisit.OrderId = order.Id;
@@ -284,6 +294,7 @@ public class OrderController : BaseController
         await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail, HttpContext.RequestAborted);
 
         
+
     }
 
     /// <summary>

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

@@ -87,6 +87,61 @@ public class PublishOrderPageBaseDto
     public List<Kv>? idNames { get; set; }
 }
 
+public class PublishPublishOrderDto
+{
+    public string Id { get; set; }
+
+    /// <summary>
+    /// 工单ID
+    /// </summary>
+    public string OrderId { get; set; }
+
+    public OrderDto Order { get; set; }
+
+    /// <summary>
+    /// 发布范围
+    /// </summary>
+    public bool PublishState { get; set; }
+
+    /// <summary>
+    /// 整理标题
+    /// </summary>
+    public string ArrangeTitle { get; set; }
+
+    /// <summary>
+    /// 整理内容
+    /// </summary>
+    public string ArrangeContent { get; set; }
+
+    /// <summary>
+    /// 整理结果
+    /// </summary>
+    public string ArrangeOpinion { get; set; }
+
+    /// <summary>
+    /// 需回访部门
+    /// </summary>
+    public List<Kv> 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
+}
+
 
 public class PublishOrderDto
 {

src/Hotline/DataSharing/WebPortal/BulletinService.cs

@@ -31,6 +31,7 @@ namespace Hotline.DataSharing.WebPortal
         {
             var data = _mapper.Map<DsBulletin>(dto);
             data.BulletinId = dto.Id;
+            data.BulletinTime = dto.ExaminTime;
             await _dsBulletinRepository.AddAsync(data, cancellationToken);
         }
     }