fix 处理已知问题

This commit is contained in:
2024-08-15 17:54:44 +08:00
parent 173ede9222
commit 9e46c26ddf
8 changed files with 54 additions and 21 deletions

View File

@@ -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);

View File

@@ -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)

View File

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