diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs
index 2de326f2..898750ae 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs
@@ -35,12 +35,21 @@ public class BalanceSummaryController : ControllerBase
}
///
- /// 餐次用餐分析,统计部门成本中心金额
+ /// 餐次用餐分析,统计部门金额和消费人数
///
- [HttpGet("department/analysis/amount")]
- public async Task> BalanceRecordAnalysisByCostIdAsync(SummaryCommonDto request)
+ [HttpGet("department/analysis/amountAndCount")]
+ public async Task> BalanceRecordAnalysisByDepartmentAsync([FromQuery] SummaryCommonDto request)
{
- return await _balanceSummaryService.BalanceRecordAnalysisByCostIdAsync(request);
+ return await _balanceSummaryService.BalanceRecordAnalysisByDepartmentAsync(request);
+ }
+
+ ///
+ /// 餐次用餐分析,统计成本中心金额和消费人数
+ ///
+ [HttpGet("costId/analysis/amountAndCount")]
+ public async Task> BalanceRecordAnalysisByCostAsync([FromQuery] SummaryCommonDto request)
+ {
+ return await _balanceSummaryService.BalanceRecordAnalysisByCostAsync(request);
}
///
diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs
index 80109baa..32f30543 100644
--- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordUserPageRequest.cs
@@ -20,12 +20,9 @@ public class BalanceRecordUserPageRequest : PageDto, IValidatableObject
public IEnumerable 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;
diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisDResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisDResponse.cs
new file mode 100644
index 00000000..11666871
--- /dev/null
+++ b/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; }
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisDepartmentResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisDepartmentResponse.cs
deleted file mode 100644
index 7692aa61..00000000
--- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisDepartmentResponse.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Dlhis.Canteen.Order.Response;
-
-public class BalanceRecordAnalysisDepartmentResponse
-{
-}
\ No newline at end of file
diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs
index ae314b0b..fc35fd02 100644
--- a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs
@@ -9,7 +9,8 @@ public interface IBalanceSummaryService : IScopeDependency
{
Task BalanceRecordAnalysisAsync(BalanceRecordAnalysisRequest request);
- Task> BalanceRecordAnalysisByCostIdAsync(SummaryCommonDto request);
+ Task> BalanceRecordAnalysisByDepartmentAsync(SummaryCommonDto request);
+ Task> BalanceRecordAnalysisByCostAsync(SummaryCommonDto request);
Task BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request);
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs
index 3f87efa6..5cbea14f 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs
+++ b/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> BalanceRecordAnalysisByCostIdAsync(SummaryCommonDto request)
+ public async Task> BalanceRecordAnalysisByDepartmentAsync(SummaryCommonDto request)
{
- // var queryable = GetQueryable(request);
+ return await GetQueryable(request)
+ .LeftJoin((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> 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);
}
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 0fb1f2f9..99c414b1 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/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
{
diff --git a/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs b/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs
index 119c0983..145236bc 100644
--- a/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs
+++ b/Src/Dlhis.Sys/Identity/Controllers/UsersController.cs
@@ -68,7 +68,6 @@ public class UsersController : ControllerBase
///
///
///
- [Authorize(Roles = "admin")]
[HttpPost("create")]
public async Task CreateUserAsync(UserCreateRequest request)
{