feat 设备获取消费记录
This commit is contained in:
@@ -32,4 +32,15 @@ public class BalancesController : ControllerBase
|
||||
{
|
||||
return await _balanceService.GetPageAsync(request);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 设备消费记录
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("device/page")]
|
||||
public async Task<Pagination<BalanceRecordResponse>> GetPageByDeviceUniqueNoAsync([FromQuery] BalanceRecordPageByDeviceUniqueNoRequest request)
|
||||
{
|
||||
return await _balanceService.GetPageByDeviceUniqueNoAsync(request);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Kurisu.Core.DataAccess.Dto;
|
||||
|
||||
namespace Dlhis.Canteen.Order.Request;
|
||||
|
||||
public class BalanceRecordPageByDeviceUniqueNoRequest : PageDto
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备唯一号
|
||||
/// </summary>
|
||||
[Required(ErrorMessage = "设备唯一号不能为空")]
|
||||
public string DeviceUniqueNo { get; set; }
|
||||
}
|
||||
@@ -28,7 +28,7 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject
|
||||
|
||||
if (SearchDateTimeDimension == DateTimeSearchEnumType.Day)
|
||||
{
|
||||
SearchDateTimePeriod.Start = new DateTime(now.Year, now.Month, now.Day, 0, 0, 1);
|
||||
SearchDateTimePeriod.Start = DateTime.Today;
|
||||
SearchDateTimePeriod.End = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59);
|
||||
}
|
||||
else if (SearchDateTimeDimension == DateTimeSearchEnumType.Week)
|
||||
|
||||
@@ -5,6 +5,8 @@ namespace Dlhis.Canteen.Order.Response;
|
||||
|
||||
public class BalanceRecordResponse
|
||||
{
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 流水号
|
||||
/// </summary>
|
||||
|
||||
@@ -7,4 +7,6 @@ namespace Dlhis.Canteen.Order.Services;
|
||||
public interface IBalanceService : IScopeDependency
|
||||
{
|
||||
Task<Pagination<BalanceRecordResponse>> GetPageAsync(BalanceRecordPageRequest request);
|
||||
|
||||
Task<Pagination<BalanceRecordResponse>> GetPageByDeviceUniqueNoAsync(BalanceRecordPageByDeviceUniqueNoRequest request);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ using Dlhis.Canteen.Order.Response;
|
||||
using Dlhis.Entity.Basic.Entity;
|
||||
using Dlhis.Entity.Canteen.Entities;
|
||||
using Kurisu.Core.DataAccess.Dto;
|
||||
using Kurisu.SqlSugar.Attributes;
|
||||
using Kurisu.SqlSugar.Extensions;
|
||||
using Kurisu.SqlSugar.Services;
|
||||
|
||||
@@ -29,6 +30,7 @@ public class BalanceService : IBalanceService
|
||||
.OrderBy(record => record.CreateTime)
|
||||
.Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse
|
||||
{
|
||||
Id = record.Id,
|
||||
Amount = record.Amount,
|
||||
BusinessPlaceCode = record.BusinessPlaceCode,
|
||||
BusinessShiftCode = record.BusinessShiftCode,
|
||||
@@ -55,4 +57,61 @@ public class BalanceService : IBalanceService
|
||||
|
||||
return page;
|
||||
}
|
||||
|
||||
[IgnoreTenant]
|
||||
public async Task<Pagination<BalanceRecordResponse>> GetPageByDeviceUniqueNoAsync(BalanceRecordPageByDeviceUniqueNoRequest request)
|
||||
{
|
||||
var now = DateTime.Now;
|
||||
var start = DateTime.Today;
|
||||
var end = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59);
|
||||
|
||||
var device = await _dbContext.Queryable<DeviceEntity>()
|
||||
.Where(x => x.UniqueNo == request.DeviceUniqueNo || x.Code == Guid.Parse(request.DeviceUniqueNo))
|
||||
.FirstAsync();
|
||||
if (device == null)
|
||||
{
|
||||
return new Pagination<BalanceRecordResponse>()
|
||||
{
|
||||
Data = new List<BalanceRecordResponse>()
|
||||
};
|
||||
}
|
||||
|
||||
var page = await _dbContext.Queryable<BalanceRecordEntity>()
|
||||
.LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
|
||||
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
|
||||
.LeftJoin<CanteenBusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
|
||||
.LeftJoin<CanteenBusinessShiftEntity>((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code)
|
||||
.Where(record => record.CreateTime >= start)
|
||||
.Where(record => record.CreateTime <= end)
|
||||
.Where(record => record.DeviceInfo == device.Code.ToString() && record.TenantId == device.TenantId)
|
||||
.OrderBy(record => record.CreateTime)
|
||||
.Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse
|
||||
{
|
||||
Id = record.Id,
|
||||
Amount = record.Amount,
|
||||
BusinessPlaceCode = record.BusinessPlaceCode,
|
||||
BusinessShiftCode = record.BusinessShiftCode,
|
||||
CostDate = record.CostDate,
|
||||
CostId = record.CostId,
|
||||
DepartmentNo = record.DepartmentNo,
|
||||
DeviceInfo = record.DeviceInfo,
|
||||
IP = record.IP,
|
||||
UserNo = record.UserNo,
|
||||
UserCode = record.UserCode,
|
||||
Type = record.Type,
|
||||
SubsidiesFromMonth = record.SubsidiesFromMonth,
|
||||
Status = record.Status,
|
||||
Source = record.Source,
|
||||
No = record.No,
|
||||
IsCostCrossTenant = record.IsCostCrossTenant,
|
||||
OriginTenantId = record.OriginTenantId,
|
||||
Name = record.Name,
|
||||
DepartmentName = department.Name,
|
||||
BusinessPlaceName = bplace.Name,
|
||||
BusinessShiftName = bshift.Name,
|
||||
})
|
||||
.ToPageListAsync(request);
|
||||
|
||||
return page;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user