Merge branch 'dev' of http://110.188.24.182:10023/Fengwo/hotline into dev

src/Hotline.Application/Orders/OrderApplication.cs

@@ -1003,7 +1003,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                AreaCode = pp.Id,
                AreaName = pp.AreaName,
                Count = SqlFunc.AggregateSum(dd.Count)
-           }).ToPivotListAsync(q=> q.AreaCode, q=> new { q.HotspotName,q.HotspotId},q=> q.Sum(x=>x.Count));
+           }).Where(q=>q.HotspotName!="").ToPivotListAsync(q=> q.AreaCode, q=> new { q.HotspotName,q.HotspotId},q=> q.Sum(x=>x.Count));
 
         var areaTitleList = await _systemAreaRepository.Queryable().Where(x => SqlFunc.Length(x.Id) == 6 && x.Id != "510000").OrderBy(x => x.Id).ToListAsync();
         return (areaTitleList, returnList);
@@ -1071,7 +1071,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                AreaCode = pp.Id,
                AreaName = pp.AreaName,
                Count = SqlFunc.AggregateSum(dd.Count)
-           }).ToPivotTableAsync(q => q.AreaName, q => new { q.HotspotName }, q => q.Sum(x => x.Count));
+           }).Where(q => q.HotspotName != "").ToPivotTableAsync(q => q.AreaName, q => new { q.HotspotName }, q => q.Sum(x => x.Count));
         return  returnList;
     }
 

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

@@ -247,6 +247,8 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public DateTime? CurrentStepAcceptTime { get; set; }
 
+        public string CurrentStepAcceptText => CurrentStepAcceptTime.HasValue ? "已签收" : "未签收";
+
         /// <summary>
         /// 当前办理时间
         /// </summary>