biorder

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

@@ -98,32 +98,17 @@ namespace Hotline.Api.Controllers.Bi
         //{
         //    dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
 
-        //    var queryOrder = _orderRepository.Queryable()
+        //    var list = _orderRepository.Queryable()
         //    .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== 2,) //会签已办超期
         //    .WhereIF(dto.QueryType == 3, x => x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()) //业务待办超期
+        //    .WhereIF(string.IsNullOrEmpty(dto.OrgCode),x=>x.ActualHandleOrgCode == dto.OrgCode)
         //    //.WhereIF(dto.QueryType ==4,) //会签待办超期
-        //    .MergeTable();
-        //    //.ToPageListAsync(dto.PageIndex, dto.PageSize);
-
-          
-        //    var queryCountersign = _workflowCountersignRepository.Queryable()
-        //    .LeftJoin<WorkflowCountersignMember>((x, o) => x.Id == o.WorkflowCountersignId)
-        //    .Where( x => x.CreationTime >= dto.StartTime)
-        //    .Where( x => x.CreationTime <= dto.EndTime)
-        //    .MergeTable();
-
-        //    var query = queryOrder.LeftJoin(queryCountersign, (or, co) => or.Id == co.w)
-        //        .Select((or, co) => new OrderBiOrgDataListVo
-        //        {
-        //            OrgName = or.OrgName,
-        //            OrgId = or.OrgId,
-        //            HandlerExtendedNum = or.HandlerExtendedNum,
-        //            NoHandlerExtendedNum = or.NoHandlerExtendedNum,
-        //            CounterHandlerExtendedNum = co.CounterHandlerExtendedNum,
-        //            CounterNoHandlerExtendedNum = co.CounterNoHandlerExtendedNum
-        //        }).MergeTable();
+        //    //.MergeTable();
+        //    .ToPageListAsync(dto.PageIndex, dto.PageSize);
+
+        //    //return list;
         //}
 
 
@@ -242,7 +227,8 @@ namespace Hotline.Api.Controllers.Bi
                     CentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed && x.ProcessType == EProcessType.Jiaoban, 1, 0)),
                     //NoCentreCareOf = SqlFunc.AggregateSum(SqlFunc.IIF((int)x.Status < 300 && x.ExpiredTime > x.FiledTime, 1, 0)),
                     Invalid = SqlFunc.AggregateSum(SqlFunc.IIF(x.AcceptType == "无效", 1, 0)),
-                    Repeat = SqlFunc.AggregateSum(SqlFunc.IIF(x.DuplicateIds != null && SqlFunc.JsonArrayLength(x.DuplicateIds) > 0, 1, 0))
+                    Repeat = SqlFunc.AggregateSum(SqlFunc.IIF(x.DuplicateIds != null && SqlFunc.JsonArrayLength(x.DuplicateIds) > 0, 1, 0)),
+                    Subtotal = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >= EOrderStatus.Filed || x.AcceptType == "无效" || (x.DuplicateIds != null && SqlFunc.JsonArrayLength(x.DuplicateIds) > 0), 1, 0))
                 }).MergeTable();
             switch (dto.SortField)
             {

src/Hotline.Share/Dtos/Order/OrderBiDto.cs

@@ -52,8 +52,8 @@ namespace Hotline.Share.Dtos.Order
 
 		public int Repeat { get; set; }
 
-        public int Subtotal => CentreArchive + CentreCareOf + NoCentreCareOf + Invalid + Repeat;
-        //public int Subtotal { get; set; }
+        //public int Subtotal => CentreArchive + CentreCareOf + NoCentreCareOf + Invalid + Repeat;
+        public int Subtotal { get; set; }
     }
 
 	public class OrderBiSpecialListVo

src/Hotline.Share/Dtos/Roles/RoleDto.cs

@@ -1,4 +1,5 @@
 using Hotline.Share.Enums.User;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Roles
 {
@@ -19,6 +20,9 @@ namespace Hotline.Share.Dtos.Roles
         public DateTime CreationTime { get; set; }
 
         public bool IsDeleted { get; set; }
+
+        public string RoleTypeText => RoleType.GetDescription();
+
     }
 
     public class AddRoleDto