src/Hotline.Application/Orders/OrderApplication.cs

@@ -2650,7 +2650,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 //Subtotal = SqlFunc.AggregateCount(x.AcceptorId),
                 CentreArchive =
                     SqlFunc.AggregateSum(
-                        SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.FileOrgIsCenter==true && it.AcceptType != "无效", 1, 0)), //中心归档件
+                        SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.FileOrgIsCenter == true && it.AcceptType != "无效", 1, 0)), //中心归档件
                 //CentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && (it.FileUserRole == EFileUserType.Org || it.FileUserRole == EFileUserType.Dispatch), 1, 0)), //转办信件
                 CentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF(
                     it.AcceptType != "无效" && (it.ProcessType == EProcessType.Jiaoban ||
@@ -3017,7 +3017,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                          x.OrderScreens.Any() == false
              //|| x.OrderScreens.Any(s => (s.Status != EScreenStatus.SendBack && s.SendBackApply != true)) == false
              )
-             .Where(x=> x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW")==false || string.IsNullOrEmpty(x.OrderVisit.Order.ReceiveProvinceNo))
+             .Where(x => x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW") == false || string.IsNullOrEmpty(x.OrderVisit.Order.ReceiveProvinceNo))
              .WhereIF(dto.ScreenType == EOrderScreenType.Seat, x => x.OrderVisit.Order.IsProvince == false)
              .WhereIF(dto.ScreenSendBack is 1,
                  x => x.OrderScreens.Any(s => s.Status == EScreenStatus.SendBack && s.ScreenType == dto.ScreenType && s.SendBackApply == true))
@@ -3407,7 +3407,11 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                     order.AcceptType = acceptModel.DicDataName;
                 }
             }
-
+            if (order.IsSecret == true && _appOptions.Value.IsYiBin == false)
+            {
+                order.FocusOnEventsName = "保密";
+                order.FocusOnEvents = "99";
+            }
             if (files != null && files.Any())
                 order.FileJson = await _fileRepository.AddFileAsync(files, order.Id, "", cancellationToken);
             await _orderDomainService.AddAsync(order, cancellationToken: cancellationToken);
@@ -3896,8 +3900,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                          d.Status != EOrderStatus.HandOverToUnAccept)
             .WhereIF(dto.QueryType is 3,
                 d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && os.IsDeleted == false && os.SpecialType == ESpecialType.ReTransact).Any())
-            .WhereIF(_appOptions.Value.IsZiGong,d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.IsDeleted == false && od.DelayState == EDelayState.Examining).NotAny())
-            .WhereIF(_appOptions.Value.IsZiGong,d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.IsDeleted == false && osba.State == ESendBackAuditState.Apply)
+            .WhereIF(_appOptions.Value.IsZiGong, d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.IsDeleted == false && od.DelayState == EDelayState.Examining).NotAny())
+            .WhereIF(_appOptions.Value.IsZiGong, d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.IsDeleted == false && osba.State == ESendBackAuditState.Apply)
                 .NotAny())
             .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(s => s.OrderId == d.Id && s.State == 0 && s.IsDeleted == false).NotAny())
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)