fix 查询优化
This commit is contained in:
@@ -242,14 +242,14 @@ public class BalanceService : IBalanceService
|
|||||||
var queryable = _dbContext.Queryable<BalanceRecordEntity>()
|
var queryable = _dbContext.Queryable<BalanceRecordEntity>()
|
||||||
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
|
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
|
||||||
.LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
|
.LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
|
||||||
|
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
|
||||||
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
|
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
|
||||||
.Where(record => myCodes.Contains(record.BusinessPlaceCode))
|
.Where(record => myCodes.Contains(record.BusinessPlaceCode))
|
||||||
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
|
|
||||||
.WhereIF(request.ShiftType.HasValue, record => record.ShiftType == request.ShiftType)
|
.WhereIF(request.ShiftType.HasValue, record => record.ShiftType == request.ShiftType)
|
||||||
.WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Search);
|
.WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Search);
|
||||||
|
|
||||||
var page = await queryable
|
var page = await queryable
|
||||||
.OrderBy(record => record.CostDateTime, OrderByType.Desc)
|
.OrderBy(record => new { CostDate = SqlFunc.Desc(record.CostDate), CostDateTime = SqlFunc.Desc(record.CostDateTime) })
|
||||||
.Select((record, department, bPlace) => new BalanceRecordDetailPageResponse
|
.Select((record, department, bPlace) => new BalanceRecordDetailPageResponse
|
||||||
{
|
{
|
||||||
Id = record.Id,
|
Id = record.Id,
|
||||||
|
|||||||
Reference in New Issue
Block a user