xiugai bug

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

@@ -610,7 +610,7 @@ namespace Hotline.Api.Controllers.Bi
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpGet("centre_data_list")]
-        public async Task<List<OrderBiCentreDataListVo>> CentreDataList([FromQuery] ReportPagedRequest dto)
+        public async Task<TotalList<OrderBiCentreDataListVo>> CentreDataList([FromQuery] ReportPagedRequest dto)
         {
             ISugarQueryable<OrderBiCentreDataListVo> query;
             if (_appOptions.Value.IsZiGong)
@@ -619,18 +619,20 @@ namespace Hotline.Api.Controllers.Bi
                 query = _orderApplication.CentreDataList(dto);
 
             var list = await query.Where(x => (x.CentreArchive + x.CentreCareOf + x.NoCentreCareOf + x.Invalid + x.Repeat) != 0).ToListAsync(HttpContext.RequestAborted);
-            if (_appOptions.Value.IsZiGong)
+
+            var total = new OrderBiCentreDataListVo
             {
-                list.Add(new OrderBiCentreDataListVo
-                {
-                    UserName = "合计",
-                    CentreArchive = list.Select(s => s.CentreArchive).Sum(),
-                    CentreCareOf = list.Select(s => s.CentreCareOf).Sum(),
-                    NoCentreCareOf = list.Select(s => s.NoCentreCareOf).Sum(),
-                    Subtotal = list.Select(s => s.Subtotal).Sum()
-                });
-            }
-            return list;
+                UserName = "合计",
+                UserId = "",
+                CentreArchive = list.Select(s => s.CentreArchive).Sum(),
+                CentreCareOf = list.Select(s => s.CentreCareOf).Sum(),
+                NoCentreCareOf = list.Select(s => s.NoCentreCareOf).Sum(),
+                Invalid = list.Select(s => s.Invalid).Sum(),
+                Repeat = list.Select(s => s.Repeat).Sum(),
+                Subtotal = list.Select(s => s.Subtotal).Sum()
+            };
+
+            return new TotalList<OrderBiCentreDataListVo>(list, total);
         }
 
         /// <summary>

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -3635,17 +3635,17 @@ public class OrderApplication : IOrderApplication, IScopeDependency
        .WhereIF(dto.StartTime.HasValue, p => p.CreationTime >= dto.StartTime)
        .WhereIF(dto.EndTime.HasValue, p => p.CreationTime <= dto.EndTime)
        .WhereIF(!string.IsNullOrEmpty(dto.UserId), p => p.AcceptorId == dto.UserId);
-        if (dto.TypeId == "0")//所有信件
+        if (dto.FieldName == "subtotal")//所有信件
             query = query.Where(p => p.Status > EOrderStatus.WaitForAccept);
 
-        if (dto.TypeId == "1")//中心归档件
+        if (dto.FieldName == "centreArchive")//中心归档件
             query = query.Where(p => p.Status >= EOrderStatus.Filed && p.FileOrgIsCenter == true);
 
-        if (dto.TypeId == "2")//转办信件
+        if (dto.FieldName == "centreCareOf")//转办信件
             query = query.Where(p => (p.Status >= EOrderStatus.Filed && p.FileOrgIsCenter == false) ||
                (p.ActualHandleStepName != "话务部" && p.Status < EOrderStatus.Filed && p.Status > EOrderStatus.WaitForAccept));
 
-        if (dto.TypeId == "3")//待转办信件
+        if (dto.FieldName == "noCentreCareOf")//待转办信件
             query = query.Where(p => p.ActualHandleStepName == "话务部" && p.Status < EOrderStatus.Filed && p.Status > EOrderStatus.WaitForAccept);
 
         query = query.OrderByDescending(p => p.CreationTime);

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -1779,7 +1779,7 @@ public record CentreDataListDetailRequest : PagedKeywordRequest
     public string? UserId { get; set; }
 
     /// <summary>
-    /// 明细类型 0：所有信件， 1：中心归档件，2：转办信件，3：待转办信件
+    /// 类型
     /// </summary>
-    public string? TypeId { get; set; }
+    public string? FieldName { get; set; }
 }