综合查询

src/Hotline.Application/JudicialManagement/EnforcementApplication.cs

@@ -21,7 +21,7 @@ namespace Hotline.Application.JudicialManagement
         private readonly IRepository<JudicialManagementOrders> _judicialManagementOrdersRepository;
         private readonly IMapper _mapper;
         private readonly ISessionContext _sessionContext;
-        private readonly IRepository<LawEnforcementAgencies> _lawEnforcementAgenciesRepository;
+        private readonly IRepository<EnforcementOrdersHandler> _enforcementOrdersHandlerRepository;
 
         /// <summary>
         /// 
@@ -35,12 +35,12 @@ namespace Hotline.Application.JudicialManagement
            IRepository<JudicialManagementOrders> judicialManagementOrdersRepository,
            IMapper mapper,
            ISessionContext sessionContext,
-           IRepository<LawEnforcementAgencies> lawEnforcementAgenciesRepository)
+           IRepository<EnforcementOrdersHandler> enforcementOrdersHandlerRepository)
         {
             _judicialManagementOrdersRepository = judicialManagementOrdersRepository;
             _mapper = mapper;
             _sessionContext = sessionContext;
-            _lawEnforcementAgenciesRepository = lawEnforcementAgenciesRepository;
+            _enforcementOrdersHandlerRepository = enforcementOrdersHandlerRepository;
         }
 
         /// <summary>
@@ -143,7 +143,7 @@ namespace Hotline.Application.JudicialManagement
         /// <returns></returns>
         public ISugarQueryable<EmDepartmentalProcessingStatisticsDto> GetDepartmentalProcessingStatisticsAsync(DateTime StartTime, DateTime EndTime)
         {
-            return _lawEnforcementAgenciesRepository.Queryable()
+            return _enforcementOrdersHandlerRepository.Queryable()
                    .LeftJoin<JudicialManagementOrders>((h, o) => h.OrderId == o.Id)
                    .Where((h, o) => o.CreationTime >= StartTime && o.CreationTime <= EndTime && o.IsItCounted == true)
                     .GroupBy((h, o) => new
@@ -170,7 +170,7 @@ namespace Hotline.Application.JudicialManagement
         /// <returns></returns>
         public ISugarQueryable<EnforcementOrderListDto> GetDepartmentalProcessingStatisticsOrderListAsync(QueryDepartmentalProcessingStatisticsDto dto)
         {
-            return _lawEnforcementAgenciesRepository.Queryable()
+            return _enforcementOrdersHandlerRepository.Queryable()
                  .LeftJoin<JudicialManagementOrders>((x, o) => x.OrderId == o.Id)
                  .Where((x, o) => o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime && o.Id != null && o.IsItCounted == true)
                  .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.OrgCode == "001", (x, o) => x.OrgCode == dto.OrgCode)

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -1895,7 +1895,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                                                                                                //.WhereIF(!string.IsNullOrEmpty(dto.OrderTagCode), d => d.OrderTagCode == dto.OrderTagCode)// 工单标签
                 .WhereIF(!string.IsNullOrEmpty(dto.OrderTagCode), d => d.OrderTags.Any(ot => ot.DicDataValue == dto.OrderTagCode)) //工单标签
                 .WhereIF(!string.IsNullOrEmpty(dto.FocusOnEvents),
-                    d => d.FocusOnEvents.Contains(dto.FocusOnEvents)) //!string.IsNullOrEmpty(d.FocusOnEvents) && SqlFunc.SplitIn(d.FocusOnEvents, dto.FocusOnEvents))
+                    d => d.FocusOnEvents.Contains(dto.FocusOnEvents) && !d.FocusOnEvents.Contains("99")) //!string.IsNullOrEmpty(d.FocusOnEvents) && SqlFunc.SplitIn(d.FocusOnEvents, dto.FocusOnEvents))
                 .OrderByIF(string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc) //默认排序时间为创建时间
                 .OrderByIF(dto is { SortField: "no", SortRule: 0 }, d => d.No, OrderByType.Asc) //工单编号升序
                 .OrderByIF(dto is { SortField: "no", SortRule: 1 }, d => d.No, OrderByType.Desc) //工单编号降序