Browse Source

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

qinchaoyue 4 months ago
parent
commit
ed9647e849

+ 9 - 0
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)

+ 4 - 0
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>

+ 4 - 0
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; }
     }
 }