diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs
index 97372ab2..3983bb7b 100644
--- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs
@@ -12,7 +12,17 @@ public class BalanceRecordPageByDeviceUniqueNoRequest : PageDto
public string DeviceUniqueNo { get; set; }
///
- /// 查询日期
+ /// 查询日期(优先使用)
///
public DateTime? SearchDate { get; set; }
-}
+
+ ///
+ /// 查询时间段(开始)
+ ///
+ public DateTime? Start { get; set; }
+
+ ///
+ /// 查询时间段(结束)
+ ///
+ public DateTime? End { get; set; }
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 15d9544e..e1ba18f4 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -118,21 +118,26 @@ public class BalanceService : IBalanceService
};
}
- var date = request.SearchDate.HasValue ? request.SearchDate.Value.Date : DateTime.Today;
-
- var switchTime = await _canteenSettingService.GetBusinessSwitchTimeAsync(device.TenantId);
- if (switchTime.HasValue)
+ if (request.SearchDate.HasValue)
{
- var setTime = date.Add(switchTime.Value.ToTimeSpan());
- if (DateTime.Now < setTime)
- date = date.AddDays(-1);
+ request.Start = request.SearchDate;
+ request.End = request.SearchDate.Value.AddDays(1);
}
+
+ // var switchTime = await _canteenSettingService.GetBusinessSwitchTimeAsync(device.TenantId);
+ // if (switchTime.HasValue)
+ // {
+ // var setTime = date.Add(switchTime.Value.ToTimeSpan());
+ // if (DateTime.Now < setTime)
+ // date = date.AddDays(-1);
+ // }
+
var page = await _dbContext.Queryable()
.LeftJoin((record, ga) => record.UserNo == ga.No)
.LeftJoin((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
- .Where(record => SqlFunc.DateIsSame(record.CostDate, date, DateType.Day))
+ .Where(record => record.CostDate >= request.Start && record.CostDate <= request.End)
.Where(record => record.DeviceUniqueNo == device.UniqueNo || record.DeviceUniqueNo == device.Code.ToString())
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
@@ -159,7 +164,7 @@ public class BalanceService : IBalanceService
//消费总金额
var sum = await _dbContext.Queryable()
- .Where(record => SqlFunc.DateIsSame(record.CostDate, date, DateType.Day))
+ .Where(record => record.CostDate >= request.Start && record.CostDate <= request.End)
.Where(record => record.DeviceUniqueNo == device.UniqueNo || record.DeviceUniqueNo == device.Code.ToString())
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.SumAsync(record => SqlFunc.Abs(SqlFunc.IsNull(record.Amount, 0)));
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index a962d085..4aa4a34c 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -53,7 +53,7 @@ public class OrderService : BaseOrderService, IOrderService
//根据档案号
var gainfo = await DbContext.Queryable()
- .Where(x => x.No == request.UserUniqueNo || x.Code == request.UserUniqueNo || x.Id == userId || x.CardNo == request.UserUniqueNo)
+ .Where(x => x.Code == request.UserUniqueNo || x.Id == userId || x.CardNo == request.UserUniqueNo)
.FirstAsync();
var message = string.Empty;