yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 消费统计

Browse Source
This commit is contained in:
liguoyang
2024-04-19 17:06:51 +08:00
parent df24e24e75
commit 99ca6696c7
13 changed files with 241 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Src/Dlhis.Canteen/Order/Controllers/BalanceSummaryController.cs Normal file
View File

@@ -0,0 +1,37 @@
using Dlhis.Canteen.Dishes.Request;
using Dlhis.Canteen.Order.Request;
using Dlhis.Canteen.Order.Response;
using Dlhis.Canteen.Order.Services;
using Kurisu.Core.DataAccess.Dto;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
namespace Dlhis.Canteen.Order.Controllers;
/// <summary>
/// 消费统计
/// </summary>
[Authorize]
[Route("api/[controller]")]
[ApiController]
public class BalanceSummaryController : ControllerBase
{
private readonly IBalanceSummaryService _balanceSummaryService;
public BalanceSummaryController(IBalanceSummaryService balanceSummaryService)
{
_balanceSummaryService = balanceSummaryService;
}
/// <summary>
/// 用餐分析
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("analysis")]
public async Task<Pagination<BalanceRecordAnalysisResponse>> BalanceRecordAnalysisAsync([FromQuery] BalanceRecordAnalysisRequest request)
{
return await _balanceSummaryService.BalanceRecordAnalysisAsync(request);
}
}

50
Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
View File

@@ -51,12 +51,12 @@ public class BalancesController : ControllerBase
/// <summary>
/// 消费明细
/// 营业点消费明细
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("recordPageDetails")]
public async Task<Pagination<BalanceRecordDetailPageResponse>> RecordPageDetailsAsync([FromQuery] BalanceRecordPageDetailRequest request)
public async Task<BalanceRecordByBusinessPlaceResponse> RecordPageDetailsAsync([FromQuery] BalanceRecordPageDetailRequest request)
{
return await _balanceService.RecordPageDetailsAsync(request);
}
@@ -97,52 +97,6 @@ public class BalancesController : ControllerBase
return await _balanceService.GetPageByUserAsync(request);
}
/// <summary>
/// 根据成本中心
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("recordByCostId")]
public async Task<Pagination<BalanceRecordCostIdResponse>> RecordByCostIdAsync([FromQuery] BalanceRecordPageByCostIdRequest request)
{
return await _balanceService.RecordByCostIdAsync(request);
}
/// <summary>
/// 消费汇总 根据部门号
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("recordSummaryByNo")]
public async Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByNoAsync([FromQuery] BalanceRecordSummaryRequest request)
{
return await _balanceService.BalanceRecordSummaryByNoAsync(request);
}
/// <summary>
/// 消费汇总 根据人事范围
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("recordSummaryByTid")]
public async Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByTidAsync([FromQuery] BalanceRecordSummaryRequest request)
{
return await _balanceService.BalanceRecordSummaryByTidAsync(request);
}
/// <summary>
/// 用餐分析
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("BalanceRecordSummaryAsync")]
public async Task<Pagination<BalanceRecordAnalysisRespones>> BalanceRecordAnalysisAsync([FromQuery] BalanceRecordAnalysisRequest request)
{
return await _balanceService.BalanceRecordAnalysisAsync(request);
}
/// <summary>
/// 获取消费机总数、离线设备数量、营业点数量、可消费人数、人均日消费额
/// </summary>

26
Src/Dlhis.Canteen/Order/Request/BalanceRecordAnalysisRequest.cs
View File

@@ -1,22 +1,26 @@
using Kurisu.Core.DataAccess.Dto;
using System.ComponentModel.DataAnnotations;
using Kurisu.Core.CustomClass;
using Kurisu.Core.DataAccess.Dto;
namespace Dlhis.Canteen.Order.Request
{
public class BalanceRecordAnalysisRequest : PageDto
public class BalanceRecordAnalysisRequest : PageDto, IValidatableObject
{
/// <summary>
/// 开始日期
/// </summary>
public DateTime? StartDatetime { get; set; }
/// <summary>
/// 结束日期
/// </summary>
public DateTime? EndDatetime { get; set; }
public DateTimePeriod SearchDateTimePeriod { get; set; }
/// <summary>
/// 营业点
/// </summary>
public Guid? BusinessPlaceCode { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (SearchDateTimePeriod != null && SearchDateTimePeriod.End.HasValue)
{
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
}
yield break;
}
}
}

34
Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs
View File

@@ -1,34 +0,0 @@
namespace Dlhis.Canteen.Order.Response;
public class BalanceRecordAnalysisRespones
{
/// <summary>
/// 消费日期
/// </summary>
public DateOnly CostDate { get; set; }
/// <summary>
/// 早餐人数
/// </summary>
public int BreakfastNumberOfPeople { get; set; }
/// <summary>
/// 午餐人数
/// </summary>
public int LunchNumberOfPeople { get; set; }
/// <summary>
/// 晚餐人数
/// </summary>
public int DinnerNumberOfPeople { get; set; }
/// <summary>
/// 宵夜人数
/// </summary>
public int LateNightNumberOfPeople { get; set; }
/// <summary>
/// 总人数
/// </summary>
public int TotalNumberOfPeople { get; set; }
}

22
Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisResponse.cs Normal file
View File

@@ -0,0 +1,22 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.Core.CustomClass;
namespace Dlhis.Canteen.Order.Response;
public class BalanceRecordAnalysisResponse
{
/// <summary>
/// 消费日期
/// </summary>
public DateOnly Date { get; set; }
/// <summary>
/// 餐次消费数据
/// </summary>
public List<KeyValueDto<ShiftEnumType, int>> Items { get; set; }
/// <summary>
/// 总人数
/// </summary>
public int Total { get; set; }
}

19
Src/Dlhis.Canteen/Order/Response/BalanceRecordDetailPageResponse.cs
View File

@@ -1,9 +1,28 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Newtonsoft.Json;
namespace Dlhis.Canteen.Order.Response;
public class BalanceRecordByBusinessPlaceResponse
{
/// <summary>
/// 消费总金额
/// </summary>
public decimal Amount { get; set; }
/// <summary>
/// 消费人数
/// </summary>
public int Total { get; set; }
/// <summary>
/// 分页数据
/// </summary>
public Pagination<BalanceRecordDetailPageResponse> Pagination { get; set; }
}
public class BalanceRecordDetailPageResponse
{
public long Id { get; set; }

2
Src/Dlhis.Canteen/Order/Services/Implements/BaseOrderService.cs → Src/Dlhis.Canteen/Order/Services/BaseOrderService.cs
View File

@@ -7,7 +7,7 @@ using Kurisu.Core.User.Abstractions;
using Kurisu.SqlSugar.Services;
using Mapster;
namespace Dlhis.Canteen.Order.Services.Implements;
namespace Dlhis.Canteen.Order.Services;
public abstract class BaseOrderService
{

15
Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
View File

@@ -15,15 +15,12 @@ public interface IBalanceService : IScopeDependency
Task SupplementBalanceAsync(BalanceSupplementRequest request);
Task<Pagination<BalanceRecordCostIdResponse>> RecordByCostIdAsync(BalanceRecordPageByCostIdRequest request);
Task<Pagination<BalanceRecordDetailPageResponse>> RecordPageDetailsAsync(BalanceRecordPageDetailRequest request);
Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByNoAsync(BalanceRecordSummaryRequest request);
Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByTidAsync(BalanceRecordSummaryRequest request);
Task<Pagination<BalanceRecordAnalysisRespones>> BalanceRecordAnalysisAsync(BalanceRecordAnalysisRequest request);
/// <summary>
/// 营业点消费明细
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<BalanceRecordByBusinessPlaceResponse> RecordPageDetailsAsync(BalanceRecordPageDetailRequest request);
Task<ConsumeNumberResponse> GetConsumeNumberAsync();

12
Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs Normal file
View File

@@ -0,0 +1,12 @@
using Dlhis.Canteen.Dishes.Request;
using Dlhis.Canteen.Order.Request;
using Dlhis.Canteen.Order.Response;
using Kurisu.Core.DataAccess.Dto;
using Microsoft.AspNetCore.Mvc;
namespace Dlhis.Canteen.Order.Services;
public interface IBalanceSummaryService : IScopeDependency
{
Task<Pagination<BalanceRecordAnalysisResponse>> BalanceRecordAnalysisAsync(BalanceRecordAnalysisRequest request);
}

405
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -160,6 +160,74 @@ public class BalanceService : IBalanceService
}
public async Task<BalanceRecordByBusinessPlaceResponse> RecordPageDetailsAsync(BalanceRecordPageDetailRequest request)
{
var myCodes = (await _businessPlacePermissionsApi.GetMyAsync()).Data.Select(x => (Guid?)x.Code).ToList();
if (request.BusinessplaceCodes.IsPresent())
{
myCodes = myCodes.Where(x => request.BusinessplaceCodes.Contains(x)).ToList();
}
var queryable = _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<GainfoEntity>((record, department, bplace, gainfo) => record.UserNo == gainfo.No)
.Where((record) => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.Where(record => myCodes.Contains(record.BusinessPlaceCode))
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDateTime >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDateTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.ShiftType.HasValue, record => record.ShiftType == request.ShiftType)
.WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Search);
var page = await queryable
.OrderBy(record => record.CostDateTime, OrderByType.Desc)
.Select((record, department, bplace, gainfo) => new BalanceRecordDetailPageResponse
{
Id = record.Id,
No = record.No,
CurrentAmount = SqlFunc.Abs(record.Amount),
CostDate = record.CostDate,
UserNo = record.UserNo,
UserCode = record.UserCode,
Source = record.Source,
UserName = record.Name,
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
CostDateTime = record.CostDateTime,
ShiftType = record.ShiftType,
Werks = gainfo.Werks,
Factory = record.TenantId,
Remark = record.Remark,
})
.ToPageListAsync(request);
try
{
var tenantResult = await _tenantApi.GetTenantsInternalAsync();
var tenants = tenantResult.Data;
page.Data.ForEach(item =>
{
item.Factory = tenants.FirstOrDefault(x => x.Code == item.Factory)?.Name;
});
}
catch (Exception)
{
}
var amount = await queryable.SumAsync(record => SqlFunc.Abs(record.Amount));
var total = await queryable.GroupBy(record => record.UserNo).Select(record => record.UserNo).CountAsync();
return new BalanceRecordByBusinessPlaceResponse
{
Amount = amount,
Total = total,
Pagination = page,
};
}
public async Task SupplementBalanceAsync(BalanceSupplementRequest request)
{
var balanceInfo = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.No == request.No).SingleAsync();
@@ -208,342 +276,6 @@ public class BalanceService : IBalanceService
}, 10);
}
/// <summary>
/// 根据成本中心
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<Pagination<BalanceRecordCostIdResponse>> RecordByCostIdAsync(BalanceRecordPageByCostIdRequest request)
{
var paeginfos = await _dbContext.Queryable<BalanceRecordEntity>()
.WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode)
.WhereIF(!request.DepartmentNo.IsEmpty(), record => record.DepartmentNo == request.DepartmentNo)
.WhereIF(!request.OriginTenantId.IsEmpty(), record => record.OriginTenantId == request.OriginTenantId)
.WhereIF(!request.CostId.IsEmpty(), record => record.CostId == request.CostId)
.WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
.WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.ToListAsync();
var lst = new List<BalanceRecordCostIdResponse>();
foreach (var costIdGroup in paeginfos.GroupBy(record => record.CostId))
{
//每个costID
var obj = new BalanceRecordCostIdResponse
{
CostId = costIdGroup.Key
};
// 所有人次
var BreakfastNumberOfPeople = costIdGroup.Count(x => x.ShiftType == ShiftEnumType.Breakfast);
var LunchNumberOfPeople = costIdGroup.Count(x => x.ShiftType == ShiftEnumType.Lunch);
var DinnerNumberOfPeople = costIdGroup.Count(x => x.ShiftType == ShiftEnumType.Dinner);
var LateNightNumberOfPeople = costIdGroup.Count(x => x.ShiftType == ShiftEnumType.Nightsnack);
// 每个餐次人数
obj.BreakfastNumberOfPeople = costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count();
obj.LunchNumberOfPeople = costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count();
obj.DinnerNumberOfPeople = costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count();
obj.LateNightNumberOfPeople = costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count();
//餐次金额
obj.BreakfastAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Sum(x => x.Amount));
obj.LunchAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Sum(x => x.Amount));
obj.DinnerAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Sum(x => x.Amount));
obj.LateNightAmount = Math.Abs(costIdGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Sum(x => x.Amount));
// 每个餐次单价
obj.BreakfastPrice = BreakfastNumberOfPeople == 0 ? 0 : Math.Round(obj.BreakfastAmount / BreakfastNumberOfPeople, 2);
obj.LunchPrice = LunchNumberOfPeople == 0 ? 0 : Math.Round(obj.LunchAmount / LunchNumberOfPeople, 2);
obj.DinnerPrice = DinnerNumberOfPeople == 0 ? 0 : Math.Round(obj.DinnerAmount / DinnerNumberOfPeople, 2);
obj.LateNightPrice = LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / LateNightNumberOfPeople, 2);
// 总人数 总金额
obj.TotalNumberOfPeople = costIdGroup.Select(x => x.UserNo).Distinct().Count();
obj.TotalAmount = obj.BreakfastAmount + obj.LunchAmount + obj.DinnerAmount + obj.LateNightAmount;
lst.Add(obj);
}
// 分页操作
var startIndex = (request.PageIndex - 1) * request.PageSize;
var pagedData = lst.Skip(startIndex).Take(request.PageSize).ToList();
var pagination = new Pagination<BalanceRecordCostIdResponse>
{
PageIndex = request.PageIndex,
PageSize = request.PageSize,
Total = lst.Count, // 使用原始列表的总数进行分页
Data = pagedData
};
return pagination;
}
/// <summary>
/// 消费明细
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<Pagination<BalanceRecordDetailPageResponse>> RecordPageDetailsAsync(BalanceRecordPageDetailRequest request)
{
var myCodes = (await _businessPlacePermissionsApi.GetMyAsync()).Data.Select(x => (Guid?)x.Code).ToList();
var page = await _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<GainfoEntity>((record, department, bplace, gainfo) => record.UserNo == gainfo.No)
.Where((record) => myCodes.Contains(record.BusinessPlaceCode))
.Where((record) => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDateTime >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDateTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.ShiftType.HasValue, record => record.ShiftType == request.ShiftType)
.WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Search)
.WhereIF(request.BusinessplaceCodes.IsPresent(), record => request.BusinessplaceCodes.Contains(record.BusinessPlaceCode))
.OrderBy(record => record.CostDateTime, OrderByType.Desc)
.Select((record, department, bplace, gainfo) => new BalanceRecordDetailPageResponse
{
Id = record.Id,
No = record.No,
CurrentAmount = SqlFunc.Abs(record.Amount),
CostDate = record.CostDate,
UserNo = record.UserNo,
UserCode = record.UserCode,
Source = record.Source,
UserName = record.Name,
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
CostDateTime = record.CostDateTime,
ShiftType = record.ShiftType,
Werks = gainfo.Werks,
Factory = record.TenantId,
Remark = record.Remark,
})
.ToPageListAsync(request);
try
{
var tenantResult = await _tenantApi.GetTenantsInternalAsync();
var tenants = tenantResult.Data;
page.Data.ForEach(item =>
{
item.Factory = tenants.FirstOrDefault(x => x.Code == item.Factory)?.Name;
});
}
catch (Exception)
{
}
return page;
}
/// <summary>
/// 消费汇总 根据部门号
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByNoAsync(BalanceRecordSummaryRequest request)
{
var paeginfos = await _dbContext.Queryable<BalanceRecordEntity>()
.WhereIF(!request.DepartmentNo.IsEmpty(), record => record.DepartmentNo == request.DepartmentNo)
.WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode)
.WhereIF(!request.OriginTenantId.IsEmpty(), record => record.TenantId == request.OriginTenantId)
.WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
.WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
.WhereIF(!request.CostId.IsEmpty(), record => record.CostId == request.CostId)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.ToListAsync();
var lst = new List<BalanceRecordSummaryRespones>();
foreach (var departmentGroup in paeginfos.GroupBy(record => record.DepartmentNo))
{
// 每个部门
var obj = new BalanceRecordSummaryRespones
{
DepartmentNo = departmentGroup.Key,
CostId = request.CostId,
OriginTenantId = ""
};
// 所有人次
var BreakfastNumberOfPeople = departmentGroup.Count(x => x.ShiftType == ShiftEnumType.Breakfast);
var LunchNumberOfPeople = departmentGroup.Count(x => x.ShiftType == ShiftEnumType.Lunch);
var DinnerNumberOfPeople = departmentGroup.Count(x => x.ShiftType == ShiftEnumType.Dinner);
var LateNightNumberOfPeople = departmentGroup.Count(x => x.ShiftType == ShiftEnumType.Nightsnack);
//每个餐次人数
obj.BreakfastNumberOfPeople = departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count();
obj.LunchNumberOfPeople = departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count();
obj.DinnerNumberOfPeople = departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count();
obj.LateNightNumberOfPeople = departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count();
//餐次金额
obj.BreakfastAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Sum(x => x.Amount));
obj.LunchAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Sum(x => x.Amount));
obj.DinnerAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Sum(x => x.Amount));
obj.LateNightAmount = Math.Abs(departmentGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Sum(x => x.Amount));
// 每个餐次单价
obj.BreakfastPrice = BreakfastNumberOfPeople == 0 ? 0 : Math.Round(obj.BreakfastAmount / BreakfastNumberOfPeople, 2);
obj.LunchPrice = LunchNumberOfPeople == 0 ? 0 : Math.Round(obj.LunchAmount / LunchNumberOfPeople, 2);
obj.DinnerPrice = DinnerNumberOfPeople == 0 ? 0 : Math.Round(obj.DinnerAmount / DinnerNumberOfPeople, 2);
obj.LateNightPrice = LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / LateNightNumberOfPeople, 2);
// 总人数 总金额
obj.TotalNumberOfPeople = departmentGroup.Select(x => x.UserNo).Distinct().Count();
obj.TotalAmount = obj.BreakfastAmount + obj.LunchAmount + obj.DinnerAmount + obj.LateNightAmount;
lst.Add(obj);
}
var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync();
lst.ForEach(x =>
{
x.DepartmentName = departments.Where(d => d.No == x.DepartmentNo).Select(d => d.Name).First();
});
// 分页操作
var startIndex = (request.PageIndex - 1) * request.PageSize;
var pagedData = lst.Skip(startIndex).Take(request.PageSize).ToList();
var pagination = new Pagination<BalanceRecordSummaryRespones>
{
PageIndex = request.PageIndex,
PageSize = request.PageSize,
Total = lst.Count, // 使用原始列表的总数进行分页
Data = pagedData
};
return pagination;
}
/// <summary>
/// 消费汇总 根据人事范围
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByTidAsync(BalanceRecordSummaryRequest request)
{
var paeginfos = await _dbContext.Queryable<BalanceRecordEntity>()
.WhereIF(!request.DepartmentNo.IsEmpty(), record => record.DepartmentNo == request.DepartmentNo)
.WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode)
.WhereIF(!request.OriginTenantId.IsEmpty(), record => record.TenantId == request.OriginTenantId)
.WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
.WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
.WhereIF(!request.CostId.IsEmpty(), record => record.CostId == request.CostId)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.ToListAsync();
var lst = new List<BalanceRecordSummaryRespones>();
foreach (var originTenantIdGroup in paeginfos.GroupBy(record => record.OriginTenantId))
{
// 每个人事范围
var obj = new BalanceRecordSummaryRespones
{
OriginTenantId = originTenantIdGroup.Key,
CostId = request.CostId,
DepartmentNo = ""
};
// 所有人次
var BreakfastNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == ShiftEnumType.Breakfast);
var LunchNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == ShiftEnumType.Lunch);
var DinnerNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == ShiftEnumType.Dinner);
var LateNightNumberOfPeople = originTenantIdGroup.Count(x => x.ShiftType == ShiftEnumType.Nightsnack);
//每个餐次人数
obj.BreakfastNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count();
obj.LunchNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count();
obj.DinnerNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count();
obj.LateNightNumberOfPeople = originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count();
//餐次金额
obj.BreakfastAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Sum(x => x.Amount));
obj.LunchAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Lunch).Sum(x => x.Amount));
obj.DinnerAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Dinner).Sum(x => x.Amount));
obj.LateNightAmount = Math.Abs(originTenantIdGroup.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Sum(x => x.Amount));
// 每个餐次单价
obj.BreakfastPrice = BreakfastNumberOfPeople == 0 ? 0 : Math.Round(obj.BreakfastAmount / BreakfastNumberOfPeople, 2);
obj.LunchPrice = LunchNumberOfPeople == 0 ? 0 : Math.Round(obj.LunchAmount / LunchNumberOfPeople, 2);
obj.DinnerPrice = DinnerNumberOfPeople == 0 ? 0 : Math.Round(obj.DinnerAmount / DinnerNumberOfPeople, 2);
obj.LateNightPrice = LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / LateNightNumberOfPeople, 2);
// 总人数 总金额
obj.TotalNumberOfPeople = originTenantIdGroup.Select(x => x.UserNo).Distinct().Count();
obj.TotalAmount = obj.BreakfastAmount + obj.LunchAmount + obj.DinnerAmount + obj.LateNightAmount;
lst.Add(obj);
}
// 分页操作
var startIndex = (request.PageIndex - 1) * request.PageSize;
var pagedData = lst.Skip(startIndex).Take(request.PageSize).ToList();
var pagination = new Pagination<BalanceRecordSummaryRespones>
{
PageIndex = request.PageIndex,
PageSize = request.PageSize,
Total = lst.Count, // 使用原始列表的总数进行分页
Data = pagedData
};
return pagination;
}
/// <summary>
/// 用餐分析
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<Pagination<BalanceRecordAnalysisRespones>> BalanceRecordAnalysisAsync(BalanceRecordAnalysisRequest request)
{
var pageinfo = await _dbContext.Queryable<BalanceRecordEntity>()
.WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
.WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
.WhereIF(request.BusinessPlaceCode.HasValue, record => record.BusinessPlaceCode == request.BusinessPlaceCode)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out)
.ToListAsync();
var lst = new List<BalanceRecordAnalysisRespones>();
foreach (var first in pageinfo.GroupBy(record => record.CostDateTime.ToString("yyyy-MM-dd")))
{
var obj = new BalanceRecordAnalysisRespones
{
CostDate = DateOnly.FromDateTime(Convert.ToDateTime(first.Key)),
//每个餐次人数
BreakfastNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count(),
LunchNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(),
DinnerNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count(),
LateNightNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count(),
TotalNumberOfPeople = first.Where(x => x.CostDate.ToString("yyyy-MM-dd") == first.Key).Select(x => x.UserNo).Distinct().Count()
};
lst.Add(obj);
}
// 分页操作
var startIndex = (request.PageIndex - 1) * request.PageSize;
var pagedData = lst.Skip(startIndex).Take(request.PageSize).ToList();
var pagination = new Pagination<BalanceRecordAnalysisRespones>
{
PageIndex = request.PageIndex,
PageSize = request.PageSize,
Total = lst.Count, // 使用原始列表的总数进行分页
Data = pagedData
};
return pagination;
}
public async Task<BalanceRecordUserResultResponse> GetPageByUserAsync(BalanceRecordUserPageRequest request)
{
var jinkoCode = _currentUser.GetUserClaim("jinko-code") ?? string.Empty;
@@ -631,6 +363,7 @@ public class BalanceService : IBalanceService
return res;
}
/// <summary>
/// 获取单日消费数据
/// </summary>

52
Src/Dlhis.Canteen/Order/Services/Implements/BalanceSummaryService.cs Normal file
View File

@@ -0,0 +1,52 @@
using Dlhis.Canteen.Order.Request;
using Dlhis.Canteen.Order.Response;
using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
using Kurisu.Core.CustomClass;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.Core.DataAccess.Extensions;
using Kurisu.SqlSugar.Services;
namespace Dlhis.Canteen.Order.Services.Implements;
public class BalanceSummaryService : IBalanceSummaryService
{
private readonly IDbContext _dbContext;
public BalanceSummaryService(IDbContext dbContext)
{
_dbContext = dbContext;
}
public async Task<Pagination<BalanceRecordAnalysisResponse>> BalanceRecordAnalysisAsync(BalanceRecordAnalysisRequest request)
{
var list = await _dbContext.Queryable<BalanceRecordEntity>()
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true && request.SearchDateTimePeriod?.End.HasValue == true,
record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
.WhereIF(request.BusinessPlaceCode.HasValue, record => record.BusinessPlaceCode == request.BusinessPlaceCode)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.ToListAsync();
var shifts = Enum.GetValues<ShiftEnumType>().ToList();
var page = list.GroupBy(record => record.CostDate).Select(grp =>
{
return new BalanceRecordAnalysisResponse
{
Date = DateOnly.FromDateTime(grp.Key),
Items = shifts.Select(shift =>
{
return new KeyValueDto<ShiftEnumType, int>
{
Key = shift,
Value = grp.Where(x => x.ShiftType == ShiftEnumType.Breakfast).DistinctBy(x => x.UserNo).Count()
};
}).ToList(),
Total = grp.Where(x => x.CostDate == grp.Key).DistinctBy(x => x.UserNo).Count()
};
})
.ToPage(request);
return page;
}
}

1
Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
View File

@@ -18,6 +18,7 @@ using Dlhis.Canteen.Order.Response;
using Dlhis.Canteen.Dishes;
using Dlhis.Canteen.Order.Request;
using Kurisu.Core.Result;
using Org.BouncyCastle.Asn1.Ocsp;
namespace Dlhis.Canteen.Order.Services.Implements;