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-12 17:51:30 +08:00
parent 583e63707b
commit 24b026aa04
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
using Dlhis.Canteen.Order.Response; using Dlhis.Canteen.Order.Response;
using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Entities; using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
using Kurisu.Core.DataAccess.Dto; using Kurisu.Core.DataAccess.Dto;
using Kurisu.Core.User.Abstractions; using Kurisu.Core.User.Abstractions;
using Kurisu.SqlSugar.Attributes; using Kurisu.SqlSugar.Attributes;
@@ -74,7 +75,7 @@ public class BalanceService : IBalanceService
{ {
now = request.SearchDate.Value; now = request.SearchDate.Value;
start = new DateTime(now.Year, now.Month, now.Day); 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<DeviceEntity>() var device = await _dbContext.Queryable<DeviceEntity>()
@@ -89,14 +90,15 @@ public class BalanceService : IBalanceService
}; };
} }
var page = await _dbContext.Queryable<BalanceRecordEntity>() var query = _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No) .LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No) .LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<CanteenBusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code) .LeftJoin<CanteenBusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<CanteenBusinessShiftEntity>((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code) .LeftJoin<CanteenBusinessShiftEntity>((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code)
.WhereIF(request.SearchDate.HasValue, record => record.CostDate >= start) .WhereIF(request.SearchDate.HasValue, record => record.CostDate >= start)
.WhereIF(request.SearchDate.HasValue, record => record.CostDate <= end) .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) .OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse .Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse
{ {
@@ -123,10 +125,11 @@ public class BalanceService : IBalanceService
BusinessPlaceName = bplace.Name, BusinessPlaceName = bplace.Name,
BusinessShiftName = bshift.Name, BusinessShiftName = bshift.Name,
CostDateTime = record.CreateTime // todo CostDateTime = record.CreateTime // todo
}) });
.ToPageListAsync(request);
return page; //.ToPageListAsync(request);
await Console.Out.WriteLineAsync(query.ToSqlValue());
return await query.ToPageListAsync(request);
} }
public async Task<Pagination<BalanceRecordUserResponse>> GetPageByUserAsync(BalanceRecordUserPageRequest request) public async Task<Pagination<BalanceRecordUserResponse>> GetPageByUserAsync(BalanceRecordUserPageRequest request)