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-08-15 16:49:50 +08:00
parent 83a6c0e8bb
commit 173ede9222
23 changed files with 342 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Src/Dlhis.Canteen/Order/Request/BalanceRecordAnalysisByShiftRequest.cs
View File

@@ -1,29 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
using Dlhis.Canteen.Order.Request.Common;
namespace Dlhis.Canteen.Order.Request;
public class BalanceRecordAnalysisByShiftRequest : PageDto, IValidatableObject
public class BalanceRecordAnalysisByShiftRequest : SummaryCommonDto
{
/// <summary>
/// 营业点
/// </summary>
public List<Guid> BusinessPlaceCodes { get; set; }
/// <summary>
///
/// </summary>
public DateTimePeriod SearchDateTimePeriod { get; set; }
/// <inheritdoc />
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (SearchDateTimePeriod is { End: not null })
{
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
}
yield break;
}
}

18
Src/Dlhis.Canteen/Order/Request/BalanceRecordAnalysisRequest.cs
View File

@@ -1,25 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
using Dlhis.Canteen.Order.Request.Common;
namespace Dlhis.Canteen.Order.Request;
public class BalanceRecordAnalysisRequest : PageDto, IValidatableObject
public class BalanceRecordAnalysisRequest : SummaryCommonDto
{
public DateTimePeriod SearchDateTimePeriod { get; set; }
/// <summary>
/// 营业点
/// </summary>
public Guid? BusinessPlaceCode { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (SearchDateTimePeriod is { End: not null })
{
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
}
yield break;
}
}

9
Src/Dlhis.Canteen/Order/Request/BalanceRecordEMealVoucherPageRequest.cs Normal file
View File

@@ -0,0 +1,9 @@
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Canteen.Order.Request;
public class BalanceRecordEMealVoucherPageRequest : PageDto
{
public DateTimePeriod SearchDateTimePeriod { get; set; }
}

28
Src/Dlhis.Canteen/Order/Request/Common/SummaryCommonDto.cs Normal file
View File

@@ -0,0 +1,28 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Canteen.Order.Request.Common;
public class SummaryCommonDto : PageDto, IValidatableObject
{
/// <summary>
/// 营业点
/// </summary>
public List<Guid> BusinessPlaceCodes { get; set; }
/// <summary>
/// 日期范围
/// </summary>
public DateTimePeriod SearchDateTimePeriod { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (SearchDateTimePeriod is { End: not null })
{
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
}
yield break;
}
}