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-01-11 15:22:30 +08:00
parent 212aa2b65d
commit 6af019485d
13 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs
View File

@@ -10,4 +10,9 @@ public class BalanceRecordPageByDeviceUniqueNoRequest : PageDto
/// </summary>
[Required(ErrorMessage = "设备唯一号不能为空")]
public string DeviceUniqueNo { get; set; }
/// <summary>
/// 查询日期
/// </summary>
public DateTime? SearchDate { get; set; }
}

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

@@ -6,6 +6,7 @@ using Kurisu.Core.DataAccess.Dto;
using Kurisu.SqlSugar.Attributes;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
using SqlSugar;
namespace Dlhis.Canteen.Order.Services.Implements;
@@ -27,7 +28,7 @@ public class BalanceService : IBalanceService
.LeftJoin<CanteenBusinessShiftEntity>((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CreateTime >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CreateTime <= request.SearchDateTimePeriod.End)
.OrderBy(record => record.CreateTime)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse
{
Id = record.Id,
@@ -65,9 +66,17 @@ public class BalanceService : IBalanceService
var start = DateTime.Today;
var end = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59);
if (request.SearchDate.HasValue)
{
now = request.SearchDate.Value;
start = new DateTime(now.Year, now.Month, now.Day, 0, 0, 1);
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>()
@@ -81,10 +90,10 @@ public class BalanceService : IBalanceService
.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)
.WhereIF(request.SearchDate.HasValue, record => record.CreateTime >= start)
.WhereIF(request.SearchDate.HasValue, record => record.CreateTime <= end)
.Where(record => record.DeviceInfo == device.Code.ToString() && record.TenantId == device.TenantId)
.OrderBy(record => record.CreateTime)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse
{
Id = record.Id,