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

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);
@@ -458,7 +454,8 @@ public class OrderController : BaseController
             SourceChannel = order.SourceChannel,
             OrderTitle = order.Title,
             Content = order.Content,
-            ActualOpinion = order.ActualOpinion
+            ActualOpinion = order.ActualOpinion,
+            NetizenEvaluateType = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.AcceptType).Select(x => new Kv { Key = x.DicDataValue, Value = x.DicDataName }).ToList()
         };
         var (idName, idNames) =
             await _workflowDomainService.GetUnvisitOrgsAsync(order.WorkflowId, HttpContext.RequestAborted);
@@ -2531,6 +2528,7 @@ public class OrderController : BaseController
                 d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
             .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == true,d=>d.CounterSignType.HasValue)
             .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == false,d=>!d.CounterSignType.HasValue)
+            .Where(x=>x.Source< ESource.MLSQ || x.Source> ESource.WZSC)
             .OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
@@ -2556,6 +2554,7 @@ public class OrderController : BaseController
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.No.Contains(dto.Keyword!) || d.Title.Contains(dto.Keyword!))
             .Where(d => string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContext.RequiredUserId)
+            .Where(x => x.Source < ESource.MLSQ || x.Source > ESource.WZSC)
             .OrderBy(d => d.Status)
             .OrderByIF(dto.IsHandled == true, d => d.StartTime, OrderByType.Asc)
             .OrderByIF(dto.IsHandled == false, d => d.CreationTime, OrderByType.Desc)
@@ -3752,7 +3751,7 @@ public class OrderController : BaseController
     /// <param name="file"></param>
     /// <returns></returns>
     [HttpPost("import-order")]
-    public async Task<object> ImportOrder([FromForm] IFormFile file)
+    public async Task<object> ImportOrder(IFormFile file)
     {
        
         using (var stream = new MemoryStream())
@@ -3798,7 +3797,7 @@ public class OrderController : BaseController
                         }
 
                     }
-                    catch
+                    catch(Exception ex)
                     {
                         errorCount++;
                     }

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

@@ -86,6 +86,8 @@ public class PublishOrderPageBaseDto
     /// 需回访部门
     /// </summary>
     public List<Kv>? idNames { get; set; }
+
+    public List<Kv>? NetizenEvaluateType { get; set; }
 }
 
 public class PublishPublishOrderDto
@@ -149,6 +151,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 +228,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/Import/ExcelContent.cs

@@ -60,6 +60,9 @@ namespace Hotline.Import
         [ExcelColumnName("办结意见")]
         public string ActualOpinion { get; set; }
 
+        [ExcelColumnName("办结部门编号")]
+        public string ActualHandleOrgCode { get; set; }
+
         [ExcelColumnName("办结部门")]
         public string ActualHandleOrgName { get; set; }
 
@@ -70,7 +73,7 @@ namespace Hotline.Import
         public EIdentityType IdentityType { get; set; }
 
         [ExcelColumnName("工单状态")]
-        public EOrderStatus OrderStatus { get; set; }
+        public EOrderStatus Status { get; set; }
 
         [ExcelColumnName("来源")]
         public ESource Source { get; set; }

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
 }

src/Hotline/Settings/SysDicTypeConsts.cs

@@ -198,4 +198,9 @@ public class SysDicTypeConsts
     /// 特提原因
     /// </summary>
     public const string SpecialReason = "SpecialReason";
+
+    /// <summary>
+    /// 网民评价类型
+    /// </summary>
+    public const string NetizenEvaluateType = "NetizenEvaluateType";
 }