feat 查询消费者厂区
This commit is contained in:
@@ -24,6 +24,11 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string Factory { get; set; }
|
public string Factory { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 消费者厂区
|
||||||
|
/// </summary>
|
||||||
|
public string FromFactory { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 日期范围查询
|
/// 日期范围查询
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -39,7 +44,7 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject
|
|||||||
/// 用户工号
|
/// 用户工号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string UserCode { get; set; }
|
public string UserCode { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 用户名称
|
/// 用户名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ public class BalanceService : IBalanceService
|
|||||||
.WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType))
|
.WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType))
|
||||||
.WhereIF(request.UserCode.IsPresent(), record => record.UserCode == request.UserCode)
|
.WhereIF(request.UserCode.IsPresent(), record => record.UserCode == request.UserCode)
|
||||||
.WhereIF(request.UserName.IsPresent(), record => record.Name == request.UserName)
|
.WhereIF(request.UserName.IsPresent(), record => record.Name == request.UserName)
|
||||||
|
.WhereIF(request.FromFactory.IsPresent(), record => record.OriginTenantId == request.FromFactory)
|
||||||
.OrderBy(record => record.CreateTime, OrderByType.Desc)
|
.OrderBy(record => record.CreateTime, OrderByType.Desc)
|
||||||
.Select((record, department, bPlace, order) => new BalanceRecordResponse
|
.Select((record, department, bPlace, order) => new BalanceRecordResponse
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user