orderpublish

src/Hotline.Api/Controllers/OrderController.cs

@@ -350,17 +350,13 @@ public class OrderController : BaseController
             throw UserFriendlyException.SameMessage("未找到工单，无法发布");
 
         //新增发布工单
-        OrderPublish orderPublish = new OrderPublish();
+
+
+        var orderPublish = _mapper.Map<OrderPublish>(dto);
+
         orderPublish.OrderId = order.Id;
         orderPublish.No = order.No;
-        orderPublish.PublishState = dto.PublishState;
-        orderPublish.ArrangeTitle = dto.ArrangeTitle;
-        orderPublish.ArrangeContent = dto.ArrangeContent;
-        orderPublish.ArrangeOpinion = dto.ArrangeOpinion;
-        orderPublish.ProPublishState = dto.ProPublishState;
-        orderPublish.FeedBackPhone = dto.FeedBackPhone;
-        orderPublish.NoPubReason = dto.NoPubReason;
-        orderPublish.CreatorName = _sessionContext.UserName;
+        
         string id = await _orderPublishRepository.AddAsync(orderPublish);
         order.Publish(orderPublish.PublishState);
         await _orderRepository.UpdateAsync(order);

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

@@ -149,6 +149,31 @@ public class PublishPublishOrderDto
     /// </summary>
     public string? NoPubReason { get; set; }
 
+    /// <summary>
+    /// 是否联系
+    /// </summary>
+    public bool? IsContact { get; set; }
+
+    /// <summary>
+    /// 是否评价
+    /// </summary>
+    public bool? IsVisited { get; set; }
+
+    /// <summary>
+    /// 网民评价
+    /// </summary>
+    public Kv? NetizenEvaluate { get; set; }
+
+    /// <summary>
+    /// 评价内容
+    /// </summary>
+    public string? EvaluateContent { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
     #endregion
 }
 
@@ -201,6 +226,31 @@ public class PublishOrderDto
     /// </summary>
     public string? NoPubReason { get; set; }
 
+    /// <summary>
+    /// 是否联系
+    /// </summary>
+    public bool? IsContact { get; set; }
+
+    /// <summary>
+    /// 是否评价
+    /// </summary>
+    public bool? IsVisited { get; set; }
+
+    /// <summary>
+    /// 网民评价
+    /// </summary>
+    public Kv? NetizenEvaluate { get; set; }
+
+    /// <summary>
+    /// 评价内容
+    /// </summary>
+    public string? EvaluateContent { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
     #endregion
 }
 

src/Hotline/Orders/OrderPublish.cs

@@ -1,4 +1,5 @@
-using Hotline.Share.Enums.Order;
+using Hotline.Share.Dtos;
+using Hotline.Share.Enums.Order;
 using Hotline.Users;
 using SqlSugar;
 using System.ComponentModel;
@@ -58,12 +59,38 @@ public class OrderPublish : FullStateEntity
     /// 反馈电话
     /// </summary>
     [SugarColumn(IsNullable = true)]
-    public string FeedBackPhone { get; set; }
+    public string? FeedBackPhone { get; set; }
 
     /// <summary>
     /// 不公开原因
     /// </summary>
     [SugarColumn(IsNullable = true)]
-    public string NoPubReason { get; set; }
+    public string? NoPubReason { get; set; }
+
+    /// <summary>
+    /// 是否联系
+    /// </summary>
+    public bool? IsContact { get; set; }
+
+    /// <summary>
+    /// 是否评价
+    /// </summary>
+    public bool? IsVisited { get; set; }
+
+    /// <summary>
+    /// 网民评价
+    /// </summary>
+    [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
+    public Kv? NetizenEvaluate { get; set; }
+
+    /// <summary>
+    /// 评价内容
+    /// </summary>
+    public string? EvaluateContent { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
     #endregion
 }