fix 处理已知问题

Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs

@@ -35,12 +35,21 @@ public class BalanceSummaryController : ControllerBase
     }
 
     /// <summary>
-    /// 餐次用餐分析,统计部门成本中心金额
+    /// 餐次用餐分析,统计部门金额和消费人数
     /// </summary>
-    [HttpGet("department/analysis/amount")]
+    [HttpGet("department/analysis/amountAndCount")]
-    public async Task<Pagination<BalanceRecordAnalysisDepartmentResponse>> BalanceRecordAnalysisByCostIdAsync(SummaryCommonDto request)
+    public async Task<Pagination<BalanceRecordAnalysisDResponse>> BalanceRecordAnalysisByDepartmentAsync([FromQuery] SummaryCommonDto request)
     {
-        return await _balanceSummaryService.BalanceRecordAnalysisByCostIdAsync(request);
+        return await _balanceSummaryService.BalanceRecordAnalysisByDepartmentAsync(request);
+    }
+
+    /// <summary>
+    /// 餐次用餐分析,统计成本中心金额和消费人数
+    /// </summary>
+    [HttpGet("costId/analysis/amountAndCount")]
+    public async Task<Pagination<BalanceRecordAnalysisDResponse>> BalanceRecordAnalysisByCostAsync([FromQuery] SummaryCommonDto request)
+    {
+        return await _balanceSummaryService.BalanceRecordAnalysisByCostAsync(request);
     }
 
     /// <summary>

Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs

@@ -20,12 +20,9 @@ public class BalanceRecordUserPageRequest : PageDto, IValidatableObject
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        if (SearchDateTimePeriod != null)
+        if (SearchDateTimePeriod is { End: not null })
         {
-            if (SearchDateTimePeriod.End != null)
+            SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
-            {
-                SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
-            }
         }
 
         yield break;

Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisDResponse.cs

@@ -0,0 +1,9 @@
+namespace Dlhis.Canteen.Order.Response;
+
+public class BalanceRecordAnalysisDResponse
+{
+    public string No { get; set; }
+    public string Name { get; set; }
+    public decimal Amount { get; set; }
+    public int Count { get; set; }
+}

Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisDepartmentResponse.cs

@@ -1,5 +0,0 @@
-namespace Dlhis.Canteen.Order.Response;
-
-public class BalanceRecordAnalysisDepartmentResponse
-{
-}

Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs

@@ -9,7 +9,8 @@ public interface IBalanceSummaryService : IScopeDependency
 {
     Task<BalanceRecordAnalysisSummaryResponse> BalanceRecordAnalysisAsync(BalanceRecordAnalysisRequest request);
 
-    Task<Pagination<BalanceRecordAnalysisDepartmentResponse>> BalanceRecordAnalysisByCostIdAsync(SummaryCommonDto request);
+    Task<Pagination<BalanceRecordAnalysisDResponse>> BalanceRecordAnalysisByDepartmentAsync(SummaryCommonDto request);
+    Task<Pagination<BalanceRecordAnalysisDResponse>> BalanceRecordAnalysisByCostAsync(SummaryCommonDto request);
 
     Task<BalanceRecordAnalysisShiftAmountResponse> BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request);
 

Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs

@@ -3,11 +3,13 @@ using Dlhis.Canteen.Order.Dto;
 using Dlhis.Canteen.Order.Request;
 using Dlhis.Canteen.Order.Request.Common;
 using Dlhis.Canteen.Order.Response;
+using Dlhis.Entity.Basic.Entity;
 using Dlhis.Entity.Canteen.Entities;
 using Dlhis.Entity.Canteen.Enums;
 using Kurisu.AspNetCore.CustomClass;
 using Kurisu.AspNetCore.DataAccess.Dto;
 using Kurisu.AspNetCore.DataAccess.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using SqlSugar;
 
@@ -30,7 +32,7 @@ public class BalanceSummaryService : IBalanceSummaryService
         }
 
         var queryable = GetQueryable(request);
-        var list =await queryable.ToListAsync();
+        var list = await queryable.ToListAsync();
 
         var sum = list.Sum(x => Math.Abs(x.Amount));
 
@@ -61,11 +63,32 @@ public class BalanceSummaryService : IBalanceSummaryService
     }
 
 
-    public async Task<Pagination<BalanceRecordAnalysisDepartmentResponse>> BalanceRecordAnalysisByCostIdAsync(SummaryCommonDto request)
+    public async Task<Pagination<BalanceRecordAnalysisDResponse>> BalanceRecordAnalysisByDepartmentAsync(SummaryCommonDto request)
     {
-       // var queryable = GetQueryable(request);
+        return await GetQueryable(request)
+            .LeftJoin<DepartmentEntity>((x, department) => x.DepartmentNo == department.No)
+            .GroupBy(x => x.DepartmentNo)
+            .Select((x, department) => new BalanceRecordAnalysisDResponse
+            {
+                No = x.DepartmentNo,
+                Name = department.Name,
+                Count = SqlFunc.AggregateDistinctCount(x.UserCode),
+                Amount = SqlFunc.AggregateSum(SqlFunc.Abs(x.Amount))
+            })
+            .ToPageListAsync(request);
+    }
 
-        return null;
+    public async Task<Pagination<BalanceRecordAnalysisDResponse>> BalanceRecordAnalysisByCostAsync(SummaryCommonDto request)
+    {
+        return await GetQueryable(request)
+            .GroupBy(x => x.CostId)
+            .Select(x => new BalanceRecordAnalysisDResponse
+            {
+                No = x.CostId,
+                Count = SqlFunc.AggregateDistinctCount(x.UserCode),
+                Amount = SqlFunc.AggregateSum(SqlFunc.Abs(x.Amount))
+            })
+            .ToPageListAsync(request);
     }
 
     public async Task<BalanceRecordAnalysisShiftAmountResponse> BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request)

Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs

@@ -147,7 +147,7 @@ public class OrderService : BaseOrderService, IOrderService
         //在线
         if (!request.IsOffline)
         {
-            gainfo.ThrowIfNull("无法识别,无权消费");
+            gainfo.ThrowIfNull("无法识别");
         }
         else
         {

Src/Dlhis.Sys/Identity/Controllers/UsersController.cs

@@ -68,7 +68,6 @@ public class UsersController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    [Authorize(Roles = "admin")]
     [HttpPost("create")]
     public async Task CreateUserAsync(UserCreateRequest request)
     {