Merge branch 'release/yibin' of http://110.188.24.182:10023/Fengwo/hotline into release/yibin

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -110,12 +110,15 @@ namespace Hotline.Api.Controllers.Bi
             dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
 
             var quer = _orderRepository.Queryable()
+                    .InnerJoin<SystemOrganize>((x, so) => x.ActualHandleOrgCode == so.Id)
                     .Where(x => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
                     .WhereIF(dto.QueryType == 1, x => x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.FiledTime) //业务已办超期
                     .WhereIF(dto.QueryType == 3, x => x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()) //业务待办超期
                     .WhereIF(dto.QueryType == 5, x =>
                         (x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.FiledTime) || (x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()))
-                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 1 or 3, x => x.ActualHandleOrgCode == dto.OrgCode);
+                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 1 or 3 && dto.OrgCode == "001", x => x.ActualHandleOrgCode == dto.OrgCode)
+                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 1 or 3 && dto.OrgCode != "001", x => x.ActualHandleOrgCode.StartsWith(dto.OrgCode))
+					.MergeTable();
 
             if (dto.QueryType is 2 or 4 or 5)
             {
@@ -124,7 +127,7 @@ namespace Hotline.Api.Controllers.Bi
                     .Where((x, o) => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
                     .WhereIF(dto.QueryType == 2, (x, o) => o.IsHandled == true) //会签已办超期
                     .WhereIF(dto.QueryType == 4, (x, o) => o.IsHandled == false) //会签待办超期
-                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 2 or 4 or 5, (x, o) => o.Key == dto.OrgCode)
+                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 2 or 4 or 5, (x, o) => o.Key.StartsWith(dto.OrgCode))
                     //.GroupBy((x,o)=>x.WorkflowId)
                     .Select((x, o) => new { Id = x.WorkflowId })
                     .MergeTable();
@@ -1089,7 +1092,6 @@ namespace Hotline.Api.Controllers.Bi
                 .WhereIF(IsCenter==true && dto.IsOnlyMy==true,x=>x.VisitOrgCode == dto.OrgCode)
                 .WhereIF(IsCenter==true && dto.IsOnlyMy==null,x=>x.VisitOrgCode.StartsWith(dto.OrgCode))
                 .WhereIF(IsCenter==false,x=>x.VisitOrgCode == dto.OrgCode)
-                .Where(x=>x.VisitOrgCode == dto.OrgCode)
                 .WhereIF(dto.TypeId == 1, x => SqlFunc.JsonField(x.OrgProcessingResults, "Key") == dto.DateValue)
                 .WhereIF(dto.TypeId == 2, x => SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == dto.DateValue)
                 .WhereIF(!string.IsNullOrEmpty(dto.LineNum), x => x.OrderVisit.Order.CallRecord.Gateway == dto.LineNum)