diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs
index 34ead05f..b30c502c 100644
--- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs
@@ -7,6 +7,17 @@ namespace Dlhis.Canteen.Order.Request;
public class BalanceRecordPageRequest : PageDto, IValidatableObject
{
+ ///
+ /// 营业点codes
+ ///
+ public List BusinessplaceCodes { get; set; }
+
+ ///
+ /// 餐次
+ ///
+ public List ShiftTypes { get; set; }
+
+
///
/// 查询日期范围类型 DateTimeSearchEnumType
///
diff --git a/Src/Dlhis.Canteen/Order/Request/OrderPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderPageRequest.cs
index cd82d190..95374cfa 100644
--- a/Src/Dlhis.Canteen/Order/Request/OrderPageRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/OrderPageRequest.cs
@@ -4,4 +4,5 @@ namespace Dlhis.Canteen.Order.Request;
public class OrderPageRequest : PageDto
{
+
}
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index ac23c1cd..69810e99 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -10,12 +10,9 @@ using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.Core.DataAccess.Entity;
using Kurisu.Core.User.Abstractions;
-using Kurisu.SqlSugar.Attributes;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
-using Microsoft.AspNetCore.Mvc;
using SqlSugar;
-using System.Globalization;
namespace Dlhis.Canteen.Order.Services.Implements;
@@ -42,6 +39,8 @@ public class BalanceService : IBalanceService
.LeftJoin((record, ga, department, bplace, bshift, type) => record.BusinessShiftCode.ToString() == type.Code)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End)
+ .WhereIF(request.BusinessplaceCodes.IsPresent(), record => request.BusinessplaceCodes.Contains(record.BusinessPlaceCode))
+ .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType))
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bplace, bshift, type) => new BalanceRecordResponse
{
@@ -407,7 +406,7 @@ public class BalanceService : IBalanceService
}
-
+
public async Task> GetPageByDeviceUniqueNoAsync(BalanceRecordPageByDeviceUniqueNoRequest request)
{
var now = DateTime.Now;
@@ -675,11 +674,11 @@ public class BalanceService : IBalanceService
public async Task> GetOaEMealVoucherAsync(OaEMealVoucherRequest request)
{
- var page = await _dbContext.Queryable()
- .Where(x => x.UserCode == request.UserCode)
- .Select()
- .ToPageListAsync(request);
- return page;
+ var page = await _dbContext.Queryable()
+ .Where(x => x.UserCode == request.UserCode)
+ .Select()
+ .ToPageListAsync(request);
+ return page;
}
public async Task> GetOaEMealVoucherDetailAsync(OaEMealVoucherDetailRequest request)
@@ -793,6 +792,6 @@ public class BalanceService : IBalanceService
{
_dbContext.Client.QueryFilter.Restore();
}
-
+
}
}
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/DeviceTaskAssignmentsController.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/DeviceTaskAssignmentsController.cs
index c11add0f..6b72836c 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/DeviceTaskAssignmentsController.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/DeviceTaskAssignmentsController.cs
@@ -32,5 +32,4 @@ public class DeviceTaskAssignmentsController : ControllerBase
{
return await _deviceTaskAssignmentService.GetPageAsync(request);
}
-
}
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index 403ca9fb..ce217e35 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
@@ -6,6 +6,7 @@ using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
+using SqlSugar;
namespace Dlhis.ScheduledTask.TaskAssignment.Services.Implements;
@@ -23,19 +24,21 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
var page = await _dbContext.Queryable()
.LeftJoin((deviceTask, ga) => deviceTask.UserNo == ga.No)
.WhereIF(!request.Search.IsEmpty(), deviceTask => deviceTask.UserNo == request.Search)
- .Select((deviceTask, ga) => new DeviceTaskAssignmentResponse
- {
- DeviceUniqueNo = deviceTask.DeviceUniqueNo,
- ResultMessage = deviceTask.ResultMessage,
- RetryCount = deviceTask.Version,
- Status = deviceTask.Status,
- UserNo = deviceTask.UserNo,
- UserName = ga.Name,
- UserCode = ga.Code,
- Type = deviceTask.Type,
- LastUpdateTime = deviceTask.ModifiedTime
- })
- .ToPageListAsync(request);
+ .OrderBy(deviceTask => deviceTask.CreateTime, OrderByType.Desc)
+ .Select((deviceTask, ga) => new DeviceTaskAssignmentResponse
+ {
+ DeviceUniqueNo = deviceTask.DeviceUniqueNo,
+ ResultMessage = deviceTask.ResultMessage,
+ RetryCount = deviceTask.Version,
+ Status = deviceTask.Status,
+ UserNo = deviceTask.UserNo,
+ UserName = ga.Name,
+ UserCode = ga.Code,
+ Type = deviceTask.Type,
+ LastUpdateTime = deviceTask.ModifiedTime
+ })
+ .ToPageListAsync(request);
+
return page;
}
}