Merge branch 'feature/snapshot' into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -4692,20 +4692,21 @@ public class OrderController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet("waited/center/base")]
-    public async Task<object> WaitedForCenterBaseData()
+    public async Task<Dictionary<string, object>> WaitedForCenterBaseData()
     {
-        var rsp = new
+        var rsp = new Dictionary<string, object>
         {
-            OrderStatus = EnumExts.GetDescriptions<EOrderStatus>(),
-            ExpiredStatus = EnumExts.GetDescriptions<EExpiredStatus>(),
-            StepNames = new string[] { "话务部", "派单组", "班长审批" },
+            {"orderStatus" ,  EnumExts.GetDescriptions<EOrderStatus>() },
+            {"expiredStatus",  EnumExts.GetDescriptions<EExpiredStatus>() },
+            { "stepNames" , new string[] { "话务部", "派单组", "班长审批" } },
         };
 
         if (_systemSettingCacheManager.Snapshot)
         {
-                var industry = await _industryRepository.Queryable()
-               .Select(d => new { d.Id, d.Name, })
-               .ToListAsync();
+            var industry = await _industryRepository.Queryable()
+           .Select(d => new { d.Id, d.Name, })
+           .ToListAsync();
+            rsp.Add("industry", industry);
         }
 
         return rsp;

src/Hotline.Application/Orders/OrderApplication.cs

@@ -3876,6 +3876,15 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         //    (string.IsNullOrEmpty(d.WorkflowId) && (string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContextProvider.SessionContext.RequiredUserId))
         //);
 
+        //随手拍
+        bool.TryParse(
+            _systemSettingCacheManager.GetSetting(SettingConstants.Snapshot)?.SettingValue[0],
+            out bool isSnapshotEnable);
+        if (isSnapshotEnable && !string.IsNullOrEmpty(dto.IndustryId))
+        {
+            query.Where(d => d.OrderSnapshot.IndustryId == dto.IndustryId);
+        }
+
         return query
             //// 交办件：已派单其他节点的工单，该选项卡下工单若办结就不显示
             //.WhereIF(dto.TypeCode.HasValue == true && dto.TypeCode == 1, d => /*d.ProcessType == EProcessType.Jiaoban &&*/ d.Status < EOrderStatus.Filed)

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

@@ -88,6 +88,10 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? CurrentStepCode { get; set; }
 
+        /// <summary>
+        /// 随手拍行业类型
+        /// </summary>
+        public string? IndustryId { get; set; }
     }
 
     /// <summary>

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

@@ -11,6 +11,10 @@ namespace Hotline.Share.Dtos.Order
     {
         public string PhoneNo { get; set; }
         public string? OrderId { get; set; }
+
+        /// <summary>
+        /// 随手拍行业类型
+        /// </summary>
         public string? IndustryId { get; set; }
     }
 }