From 24b026aa0465a402feb7774e43f9598f398de91e Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 12 Jan 2024 17:51:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=8F=B7=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Services/Implements/BalanceService.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 552c7ae1..1e320bab 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -2,6 +2,7 @@ using Dlhis.Canteen.Order.Response; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Canteen.Entities; +using Dlhis.Entity.Canteen.Enums; using Kurisu.Core.DataAccess.Dto; using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Attributes; @@ -74,7 +75,7 @@ public class BalanceService : IBalanceService { now = request.SearchDate.Value; start = new DateTime(now.Year, now.Month, now.Day); - end = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59); + end = new DateTime(now.Year, now.Month, now.Day + 1); } var device = await _dbContext.Queryable() @@ -89,14 +90,15 @@ public class BalanceService : IBalanceService }; } - var page = await _dbContext.Queryable() + var query = _dbContext.Queryable() .LeftJoin((record, ga) => record.UserNo == ga.No) .LeftJoin((record, ga, department) => ga.DepartmentNo == department.No) .LeftJoin((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code) .LeftJoin((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code) .WhereIF(request.SearchDate.HasValue, record => record.CostDate >= start) .WhereIF(request.SearchDate.HasValue, record => record.CostDate <= end) - .Where(record => record.DeviceInfo == device.Code.ToString() && record.TenantId == device.TenantId) + .Where(record => record.TenantId == device.TenantId || (record.DeviceInfo == device.Code.ToString() || record.DeviceInfo == device.UniqueNo)) + .Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid) .OrderBy(record => record.CreateTime, OrderByType.Desc) .Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse { @@ -123,10 +125,11 @@ public class BalanceService : IBalanceService BusinessPlaceName = bplace.Name, BusinessShiftName = bshift.Name, CostDateTime = record.CreateTime // todo - }) - .ToPageListAsync(request); + }); - return page; + //.ToPageListAsync(request); + await Console.Out.WriteLineAsync(query.ToSqlValue()); + return await query.ToPageListAsync(request); } public async Task> GetPageByUserAsync(BalanceRecordUserPageRequest request)