yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Browse Source
This commit is contained in:
cheche
2024-03-06 09:25:39 +08:00
parent 18a92b96d8 8157f0a01b
commit 04ff6ae94a
37 changed files with 292 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,11 +36,15 @@ public class BalanceService : IBalanceService
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<BusinessShiftEntity>((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code)
.LeftJoin<BasicTypeEntity>((record, ga, department, bplace, bshift, type) => record.BusinessShiftCode.ToString() == type.Code)
.LeftJoin<BasicTypeEntity>((record, ga, department, bplace, bshift, type) => record.ShiftType == type.Code && type.Type == "mealshift")
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End)
.WhereIF(request.BusinessplaceCodes.IsPresent(), record => request.BusinessplaceCodes.Contains(record.BusinessPlaceCode))
.WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType))
.WhereIF(request.Search.IsPresent(), (record, ga) =>
ga.Name.Contains(request.Search)
|| ga.Code.Contains(request.Search)
)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bplace, bshift, type) => new BalanceRecordResponse
{
@@ -66,7 +70,7 @@ public class BalanceService : IBalanceService
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
BusinessShiftName = type.Display,
CostDateTime = record.CreateTime // todo
CostDateTime = record.CostDateTime
})
.ToPageListAsync(request);