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
2025-06-10 13:48:31 +08:00
parent aca027e9e6
commit f0f467562c
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailRequest.cs
View File

@@ -17,13 +17,17 @@ public class BalanceRecordPageDetailRequest : PageDto, IValidatableObject
/// </summary> /// </summary>
public List<Guid?> BusinessplaceCodes { get; set; } public List<Guid?> BusinessplaceCodes { get; set; }
/// <summary>
/// 餐次 ShiftEnumType
/// </summary>
public List<ShiftEnumType?> ShiftTypes { get; set; }
/// <summary> /// <summary>
/// 餐次 ShiftEnumType /// 餐次 ShiftEnumType
/// </summary> /// </summary>
[EnumDataType(typeof(ShiftEnumType))] [EnumDataType(typeof(ShiftEnumType))]
public ShiftEnumType? ShiftType { get; set; } public ShiftEnumType? ShiftType { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext) public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{ {
if (SearchDateTimePeriod?.End != null) if (SearchDateTimePeriod?.End != null)
@@ -31,6 +35,13 @@ public class BalanceRecordPageDetailRequest : PageDto, IValidatableObject
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1); SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
} }
if (ShiftType.HasValue)
{
ShiftTypes ??= new List<ShiftEnumType?>();
ShiftTypes.Add(ShiftType);
ShiftTypes = ShiftTypes.Distinct().ToList();
}
yield break; yield break;
} }
} }

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

@@ -304,7 +304,7 @@ public class BalanceService : IBalanceService
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End) .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.ShiftType.HasValue, record => record.ShiftType == request.ShiftType) .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.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
@@ -368,7 +368,7 @@ public class BalanceService : IBalanceService
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End) .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.ShiftType.HasValue, record => record.ShiftType == request.ShiftType) .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.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 rows = await queryable var rows = await queryable