From b3fe957a1bec7be787191020a47eb92fbfd12297 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 9 Sep 2024 11:15:17 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/BalanceService.cs | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index ba37ddfd..de93f8b6 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -49,12 +49,9 @@ public class BalanceService : IBalanceService public async Task> GetPageAsync(BalanceRecordPageRequest request) { var page = await _dbContext.Queryable() - .LeftJoin((record, ga) => record.UserNo == ga.No) - //.LeftJoinIF(request.GainfoStatus == GainfoStatusEnumType.Working, (record, ga) => record.UserNo == ga.No) - //.LeftJoinIF(request.GainfoStatus == GainfoStatusEnumType.Leave, (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, order) => record.No == order.No) + .LeftJoin((record, department) => record.DepartmentNo == department.No) + .LeftJoin((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code) + .LeftJoin((record, department, bPlace, order) => record.No == order.No) .WhereIF(request.Factory.IsPresent(), record => record.TenantId == request.Factory) .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End) .WhereIF(request.Type.HasValue, record => record.Type == request.Type) @@ -62,7 +59,7 @@ public class BalanceService : IBalanceService .WhereIF(request.UserCode.IsPresent(), record => record.UserCode == request.UserCode) .WhereIF(request.UserName.IsPresent(), record => record.Name == request.UserName) .OrderBy(record => record.CreateTime, OrderByType.Desc) - .Select((record, ga, department, bPlace, order) => new BalanceRecordResponse + .Select((record, department, bPlace, order) => new BalanceRecordResponse { Id = record.Id, No = record.No, @@ -182,17 +179,16 @@ public class BalanceService : IBalanceService } var page = await _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, imageRecord) => imageRecord.No == record.No) + .LeftJoin((record, department) => record.DepartmentNo == department.No) + .LeftJoin((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code) + .LeftJoin((record, department, bPlace, imageRecord) => imageRecord.No == record.No) .Where(record => record.DeviceUniqueNo == device.UniqueNo) .Where(record => record.CostDate >= request.Start && record.CostDate <= request.End) .Where(record => record.Type == BalanceRecordTypeEnumType.Out && (record.Status == BalanceRecordStatusEnumType.Valid || (record.Status == BalanceRecordStatusEnumType.Obsolute && record.Remark == "退款"))) .WhereIF(request.UserCode.IsPresent(), record => record.UserCode == request.UserCode) .OrderBy(record => record.CostDateTime, OrderByType.Desc) - .Select((record, ga, department, bPlace, imageRecord) => new BalanceRecordDeviceResponse + .Select((record, department, bPlace, imageRecord) => new BalanceRecordDeviceResponse { Id = record.Id, Amount = SqlFunc.Abs(record.Amount), @@ -238,7 +234,6 @@ public class BalanceService : IBalanceService var queryable = _dbContext.Queryable() .LeftJoin((record, department) => record.DepartmentNo == department.No) .LeftJoin((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code) - .LeftJoin((record, department, bPlace, gainfo) => record.UserNo == gainfo.No) .Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid) .Where(record => myCodes.Contains(record.BusinessPlaceCode)) .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End) @@ -247,7 +242,7 @@ public class BalanceService : IBalanceService var page = await queryable .OrderBy(record => record.CostDateTime, OrderByType.Desc) - .Select((record, department, bPlace, gainfo) => new BalanceRecordDetailPageResponse + .Select((record, department, bPlace) => new BalanceRecordDetailPageResponse { Id = record.Id, No = record.No,