fix 日志倒叙

This commit is contained in:
cheche
2024-03-06 16:12:39 +08:00
parent 11690623a4
commit 2364b82540
5 changed files with 40 additions and 3 deletions

View File

@@ -147,6 +147,7 @@ public class BalancesController : ControllerBase
return await _balanceService.GetConsumeNumberAsync();
}
/// <summary>
/// 获取消费机详情
/// </summary>

View File

@@ -0,0 +1,24 @@
using SqlSugar;
namespace Dlhis.Canteen.Order.Response
{
public class SpendingDetailResponse
{
/// <summary>
/// 档案号
/// </summary>
public string No { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string Name { get; set; }
/// <summary>
/// 学工号
/// </summary>
public string Code { get; set; }
}
}

View File

@@ -27,6 +27,8 @@ public interface IBalanceService : IScopeDependency
Task<ConsumeNumberResponse> GetConsumeNumberAsync();
Task<Pagination<DevicePageResponse>> GetConsumeDeviceAsync(GetConsumeDeviceRequest request);
Task DispositionDeviceAsync(DispositionDeviceRequest request);

View File

@@ -562,6 +562,7 @@ public class BalanceService : IBalanceService
var offCount = await GetOfflineDevicesCount(devices);
var places = await _dbContext.Queryable<BusinessPlaceEntity>()
.Where(x =>x.Status == CanteenBusinessPlaceStatusEnumType.Opened)
.ToListAsync();
var time = DateTime.Now.ToString("yyyy-MM-dd");
@@ -598,6 +599,8 @@ public class BalanceService : IBalanceService
}
public async Task<Pagination<DevicePageResponse>> GetConsumeDeviceAsync(GetConsumeDeviceRequest request)
{
if (request.IsOff)
@@ -743,11 +746,16 @@ public class BalanceService : IBalanceService
place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在");
var devices = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
foreach (var no in request.UniqueNos)
if (request.UniqueNos!=null && request.UniqueNos.Count > 0)
{
var device = devices.Where(x => x.UniqueNo == no).First();
device.ThrowIfNull($"{no}:设备不存在");
foreach (var no in request.UniqueNos)
{
var device = devices.Where(x => x.UniqueNo == no).First();
device.ThrowIfNull($"{no}:设备不存在");
}
}
var regiss = await _dbContext.Queryable<DeviceRegistryEntity>()
.Where(x => request.UniqueNos.Contains(x.DeviceUniqueNo))
.ToListAsync();

View File

@@ -6,6 +6,7 @@ using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
using SqlSugar;
namespace Dlhis.Common.Services
{
@@ -23,6 +24,7 @@ namespace Dlhis.Common.Services
var logs = await _dbContext.ChangeDb("log").Queryable<ApiLogEntity>()
.WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search))
.WhereIF(request.Level.HasValue, x => x.Level == request.Level)
.OrderBy(x => x.Timestamp,OrderByType.Desc)
.Select<ApiLogResponse>()
.ToPageListAsync(request);