Explorar o código

Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

田爽 hai 1 ano
pai
achega
de53c45a37
Modificáronse 1 ficheiros con 22 adicións e 16 borrados
  1. 22 16
      src/Hotline.Api/Controllers/Bi/BiOrderController.cs

+ 22 - 16
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -94,22 +94,28 @@ namespace Hotline.Api.Controllers.Bi
 
         }
 
-        //public async Task OrgDataListDetail([FromQuery] OrgDataListDetailRequest dto)
-        //{
-        //    dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
-
-        //    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);
-
-        //    //return list;
-        //}
+        /// <summary>
+        /// 部门超期统计明细
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpGet("org_data_list_detail")]
+        public async Task<PagedDto<OrderDto>> OrgDataListDetail([FromQuery] OrgDataListDetailRequest dto)
+        {
+            dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
+
+            var (total,items) = await _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();
+            .ToPagedListAsync(dto.PageIndex, dto.PageSize);
+
+            return new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));
+        }
 
 
         /// <summary>