diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
index 8ed0dd64..8c306db1 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
@@ -162,4 +162,26 @@ public class BalancesController : ControllerBase
{
return await _balanceService.GetSupplementTrendsAsync(request);
}
+
+ ///
+ /// 电子餐券申请记录查询
+ ///
+ ///
+ [HttpGet("oaemealvoucher")]
+ public async Task> GetOaEMealVoucherAsync([FromQuery] OaEMealVoucherRequest request)
+ {
+ return await _balanceService.GetOaEMealVoucherAsync(request);
+ }
+
+ ///
+ /// 电子餐券使用记录查询
+ ///
+ ///
+ ///
+ [HttpGet("oaemealvoucherdetail")]
+ public async Task> GetOaEMealVoucherDetailAsync([FromQuery] OaEMealVoucherDetailRequest request)
+ {
+ return await _balanceService.GetOaEMealVoucherDetailAsync(request);
+ }
+
}
diff --git a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs
new file mode 100644
index 00000000..1a4d504b
--- /dev/null
+++ b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs
@@ -0,0 +1,12 @@
+using Kurisu.Core.DataAccess.Dto;
+
+namespace Dlhis.Canteen.Order.Request
+{
+ public class OaEMealVoucherDetailRequest : PageDto
+ {
+ ///
+ /// 餐券id
+ ///
+ public long OaEMealVoucherId { get; set; }
+ }
+}
diff --git a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs
new file mode 100644
index 00000000..a77865a7
--- /dev/null
+++ b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs
@@ -0,0 +1,14 @@
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.Core.DataAccess.Dto;
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Canteen.Order.Request
+{
+ public class OaEMealVoucherRequest : PageDto
+ {
+ ///
+ /// 用户学工号
+ ///
+ public string UserCode { get; set; }
+ }
+}
diff --git a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherDetailResponse.cs
new file mode 100644
index 00000000..d57c1e7e
--- /dev/null
+++ b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherDetailResponse.cs
@@ -0,0 +1,65 @@
+using SqlSugar;
+
+namespace Dlhis.Canteen.Order.Response
+{
+ public class OaEMealVoucherDetailResponse
+ {
+ public long Id { get; set; }
+
+ public long VoucherId { get; set; }
+
+ public int Sequence { get; set; }
+
+ public string DinnerType { get; set; }
+
+ ///
+ /// 身份证
+ ///
+ public string IdNo { get; set; }
+
+ ///
+ /// 用餐人
+ ///
+ public string Name { get; set; }
+
+ ///
+ /// 手机号
+ ///
+ public string Phone { get; set; }
+
+ ///
+ /// 就餐开始
+ ///
+ public DateTime Start { get; set; }
+
+ ///
+ /// 就餐结束
+ ///
+ public DateTime End { get; set; }
+
+ ///
+ /// 就餐天数
+ ///
+ public int Days { get; set; }
+
+ ///
+ /// 金额
+ ///
+ public decimal Amount { get; set; }
+
+ ///
+ /// 二维码
+ ///
+ public string QrCode { get; set; }
+
+ ///
+ /// 状态
+ ///
+ public string Status { get; set; }
+
+ ///
+ /// 信息
+ ///
+ public string Message { get; set; }
+ }
+}
diff --git a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs
new file mode 100644
index 00000000..32ceaeb3
--- /dev/null
+++ b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs
@@ -0,0 +1,100 @@
+using SqlSugar;
+
+namespace Dlhis.Canteen.Order.Response
+{
+ public class OaEMealVoucherResponse
+ {
+ public long Id { get; set; }
+
+ ///
+ /// 标题
+ ///
+ public string Title { get; set; }
+
+ ///
+ /// 申请人工号
+ ///
+ public string UserCode { get; set; }
+
+ ///
+ /// 申请人名称
+ ///
+ public string Name { get; set; }
+
+ ///
+ /// 基地代码
+ ///
+ public string TenantId { get; set; }
+
+ ///
+ /// 基地名称
+ ///
+ public string TenantName { get; set; }
+
+ ///
+ /// 成本中心
+ ///
+ public string CostId { get; set; }
+
+ ///
+ /// 成本中心名称
+ ///
+ public string CostName { get; set; }
+
+ ///
+ /// 来宾公司
+ ///
+ public string Company { get; set; }
+
+ ///
+ /// 联系人
+ ///
+ public string Phone { get; set; }
+
+ ///
+ /// 来宾人数
+ ///
+ public int Num { get; set; }
+
+ ///
+ /// 就餐食堂
+ ///
+ public string Canteen { get; set; }
+
+ ///
+ /// 就餐事由
+ ///
+ public string Reason { get; set; }
+
+ ///
+ /// 就餐次
+ ///
+ public string CanteenShift { get; set; }
+
+ ///
+ /// oa流程id
+ ///
+ public string OaId { get; set; }
+
+ ///
+ /// 部门号
+ ///
+ public string DepartmentNo { get; set; }
+
+ ///
+ /// 部门名称
+ ///
+ public string DepartmentName { get; set; }
+
+
+ ///
+ /// 申请日期
+ ///
+ public DateTime LogDate { get; set; }
+
+ ///
+ /// 数据创建时间
+ ///
+ public DateTime CreateTime { get; set; }
+ }
+}
diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
index 8ba54785..1c02cd6f 100644
--- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
@@ -30,4 +30,8 @@ public interface IBalanceService : IScopeDependency
Task> GetConsumptionTrendsAsync(ConsumptionTrendRequest request);
Task> GetSupplementTrendsAsync(ConsumptionTrendRequest request);
+
+ Task> GetOaEMealVoucherAsync([FromQuery] OaEMealVoucherRequest request);
+
+ Task> GetOaEMealVoucherDetailAsync([FromQuery] OaEMealVoucherDetailRequest request);
}
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 08f58d1b..9a3f88b0 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -642,6 +642,25 @@ public class BalanceService : IBalanceService
return new List();
}
+ public async Task> GetOaEMealVoucherAsync(OaEMealVoucherRequest request)
+ {
+ var page = await _dbContext.Queryable()
+ .Where(x => x.UserCode == request.UserCode)
+ .Select()
+ .ToPageListAsync(request);
+ return page;
+ }
+
+ public async Task> GetOaEMealVoucherDetailAsync(OaEMealVoucherDetailRequest request)
+ {
+ var page = await _dbContext.Queryable()
+ .Where(x => x.VoucherId == request.OaEMealVoucherId)
+ .Select()
+ .ToPageListAsync(request);
+
+ return page;
+ }
+
///
/// 获取当前年所有月
///