소스 검색

工单查询

Dun.Jason 6 달 전
부모
커밋
4d031a19e1
2개의 변경된 파일2개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 4
      src/Hotline.Api/Controllers/OrderController.cs
  2. 0 1
      src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

+ 2 - 4
src/Hotline.Api/Controllers/OrderController.cs

@@ -2936,8 +2936,8 @@ public class OrderController : BaseController
             .Includes(d => d.OrderPublish)
             .Includes(d => d.OrderPushTypes)
             //.Includes(d => d.OrderScreens)
-            .Includes(d => d.OrderVisits, x => x.OrderVisitDetails)
-            .Includes(d => d.OrderVisits, x => x.Employee)
+            .Includes(d => d.OrderVisits.Where(x => x.VisitState == EVisitState.Visited).ToList(), x => x.OrderVisitDetails)
+            .Includes(d => d.OrderVisits.Where(x => x.VisitState == EVisitState.Visited).ToList(), x => x.Employee)
             .FirstAsync(d => d.Id == id);
         if (order == null) return new();
 
@@ -2973,8 +2973,6 @@ public class OrderController : BaseController
                     {
                         canInsteadHandle = false;
                     }
-
-                    ;
                 }
 
                 if (canInsteadHandle)

+ 0 - 1
src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -664,7 +664,6 @@ namespace Hotline.Application.Subscribers
                     orderVisit.VisitTime = dto.VisitTime;
                     orderVisit.VisitType = dto.VisitType;
                     orderVisit.IsCanAiVisit = false;
-                    orderVisit.IsCanHandle = false;
                     var VisitSatisfaction = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.VisitSatisfaction)
                         .Where(x => x.DicDataValue == dto.OrgProcessingResults).Select(m => new Kv { Key = m.DicDataValue, Value = m.DicDataName })
                         .FirstOrDefault();