order_visit

src/Hotline.Api/Controllers/AiController.cs

@@ -142,7 +142,7 @@ namespace Hotline.Api.Controllers
                             var orgDetail = visitDetail.Where(x => x.VisitTarget == Share.Enums.Order.EVisitTarget.Org).ToList();
                             //过滤结果
                             var orgProcessingResults = new Kv();
-                            var orgHandledAttitude = new Kv();
+                            //var orgHandledAttitude = new Kv();
                             ESeatEvaluate? seatEvaluate = null;
                             var visitContent = "";
                             var seatVisitContent = "";
@@ -237,7 +237,7 @@ namespace Hotline.Api.Controllers
                             //处理结果
                             orgDetail.ForEach(x =>
                             {
-                                x.OrgHandledAttitude = orgHandledAttitude;
+                                //x.OrgHandledAttitude = orgHandledAttitude;
                                 x.OrgProcessingResults = orgProcessingResults;
                                 x.VisitContent = visitContent;
                                 x.Volved = isSolve;

src/Hotline.Api/Controllers/OrderController.cs

@@ -1555,6 +1555,10 @@ public class OrderController : BaseController
         if (screenAny)
             throw UserFriendlyException.SameMessage("该工单已提起甄别申请，正在审批过程中，不能申请");
 
+        var isNoPass = await _orderScreenRepository.AnyAsync(x => x.Status == EScreenStatus.Refuse && x.VisitDetailId == dto.Data.VisitDetailId);
+        if (isNoPass)
+            throw UserFriendlyException.SameMessage("该工单已被拒绝过甄别申请，不能再次申请");
+
         var setting = _systemSettingCacheManager.GetSetting(SettingConstants.ScreenApplyNum);
         int count = await _orderScreenRepository.CountAsync(x =>
             x.OrderId == dto.Data.OrderId && x.Status == EScreenStatus.Refuse && x.VisitDetailId == dto.Data.VisitDetailId);

src/Hotline.Application/Handlers/FlowEngine/WorkflowEndHandler.cs

@@ -217,7 +217,7 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
                         {
                             var screenSatisfy = new Kv() { Key = "-1", Value = "视为满意" };
                             visitDetail.OrgProcessingResults = screenSatisfy;
-                            visitDetail.OrgHandledAttitude = screenSatisfy;
+                            //visitDetail.OrgHandledAttitude = screenSatisfy;
                             await _orderVisitedDetailRepository.UpdateAsync(visitDetail, cancellationToken);
                             // 修改主表当前评价结果
                             await _orderVisitRepository.Updateable().SetColumns(v => new OrderVisit() { NowEvaluate = screenSatisfy }).Where(v => v.Id == visitDetail.VisitId).ExecuteCommandAsync(cancellationToken);

src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs

@@ -227,7 +227,7 @@ namespace Hotline.Application.Orders
 				.WhereIF(dto.VisitTime.HasValue && dto.EndVisitTime.HasValue, x => x.OrderVisit.VisitTime == dto.VisitTime && x.OrderVisit.VisitTime <= dto.EndVisitTime)
 				.WhereIF(!string.IsNullOrEmpty(dto.VisitOrgName), x => x.VisitOrgName!.Contains(dto.VisitOrgName!))
 				.WhereIF(!string.IsNullOrEmpty(dto.OrgProcessingResults), x => SqlFunc.JsonField(x.OrgProcessingResults, "Key") == dto.OrgProcessingResults)
-				.WhereIF(!string.IsNullOrEmpty(dto.OrgHandledAttitude), x => SqlFunc.JsonListObjectAny(x.OrgHandledAttitude, "Key", dto.OrgHandledAttitude))
+				//.WhereIF(!string.IsNullOrEmpty(dto.OrgHandledAttitude), x => SqlFunc.JsonListObjectAny(x.OrgHandledAttitude, "Key", dto.OrgHandledAttitude))
 				.WhereIF(!string.IsNullOrEmpty(dto.OrgNoSatisfiedReason), x => SqlFunc.JsonField(x.OrgNoSatisfiedReason, "Key") == dto.OrgNoSatisfiedReason)
 				.Where((x, s) => x.OrderVisit.VisitState != EVisitState.None && x.OrderVisit.IsCanHandle)
 				.Where((x, s) => x.OrderVisit.Order.CounterSignType == null && x.OrderVisit.Order.ActualHandleOrgCode == _sessionContext.OrgId)
@@ -239,9 +239,9 @@ namespace Hotline.Application.Orders
 								  x.OrderVisit.Order.No.Contains(dto.Keyword!))
 					.Where((x, s) => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode.StartsWith(_sessionContext.OrgId) && (
 						SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
-						SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||
-						SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" ||
-						SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "2"
+						SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" 
+						//||SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" ||
+						//SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "2"
 					));
 			}
 			else
@@ -251,9 +251,9 @@ namespace Hotline.Application.Orders
 								  x.OrderVisit.Order.No.Contains(dto.Keyword!))
 					.Where((x, s) => x.VisitTarget == EVisitTarget.Org && (
 						SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
-						SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||
-						SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" ||
-						SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "2"
+						SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" 
+						//||SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" ||
+						//SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "2"
 					));
 			}