feat 菜品/菜单配置

This commit is contained in:
2024-03-18 10:01:03 +08:00
parent 6ba2d7d6a2
commit ab406adecf
32 changed files with 775 additions and 52 deletions

View File

@@ -2,8 +2,6 @@
using Dlhis.Basic.Device.Response;
using Dlhis.Basic.Device.Services;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
using Kurisu.AspNetCore.EventBus.Abstractions;
using Kurisu.AspNetCore.Scope;
using Kurisu.Core.DataAccess.Dto;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

View File

@@ -48,19 +48,19 @@ public class DeviceService : IDeviceService
var deviceUniqueNos = page.Data.Select(x => x.UniqueNo).ToList();
var balanceInfos = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.Type == BalanceRecordTypeEnumType.Out)
.Where(x => deviceUniqueNos.Contains(x.DeviceInfo))
.Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo))
.Select(x => new
{
x.DeviceInfo,
x.DeviceUniqueNo,
Amount = SqlFunc.AggregateSum(x.Amount),
UserCount = SqlFunc.AggregateDistinctCount(x.UserCode)
})
.GroupBy(x => x.DeviceInfo)
.GroupBy(x => x.DeviceUniqueNo)
.ToListAsync();
page.Data.ForEach(device =>
{
var info = balanceInfos.FirstOrDefault(x => x.DeviceInfo == device.UniqueNo);
var info = balanceInfos.FirstOrDefault(x => x.DeviceUniqueNo == device.UniqueNo);
if (info != null)
{
device.Amount = info.Amount;