diff --git a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs
deleted file mode 100644
index 216f85b1..00000000
--- a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherDetailRequest.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Kurisu.Core.DataAccess.Dto;
-
-namespace Dlhis.Canteen.Dishes.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
deleted file mode 100644
index 232b4eeb..00000000
--- a/Src/Dlhis.Canteen/Order/Request/OaEMealVoucherRequest.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Dlhis.Entity.Canteen.Enums;
-using Kurisu.Core.DataAccess.Dto;
-using System.ComponentModel.DataAnnotations;
-
-namespace Dlhis.Canteen.Dishes.Request
-{
- public class OaEMealVoucherRequest : PageDto
- {
- }
-}
diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs
index 485da9f5..d6a22e69 100644
--- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs
@@ -1,13 +1,13 @@
namespace Dlhis.Canteen.Order.Response;
-namespace Dlhis.Canteen.Order.Response
+namespace Dlhis.Canteen.Order.Response;
+
+public class BalanceRecordByUserResponse
{
- public class BalanceRecordByUserResponse
- {
- ///
- /// 流水号
- ///
- public string No { get; set; }
+ ///
+ /// 流水号
+ ///
+ public string No { get; set; }
///
/// 金额
@@ -49,93 +49,13 @@ namespace Dlhis.Canteen.Order.Response
///
public decimal Amount { get; set; }
+ ///
+ /// 消费时间
+ ///
+ public DateTime CostDateTime { get; set; }
- ///
- /// 营业点
- ///
- public Guid? BusinessPlaceCode { get; set; }
-
- ///
- /// 餐别
- ///
- public Guid? BusinessShiftCode { get; set; }
-
- ///
- /// 餐次
- ///
- public ShiftEnumType? ShiftType { get; set; }
-
- ///
- /// 餐次CN
- ///
- public string ShiftTypeCN => ShiftType.GetDescription();
-
- ///
- /// 所属成本日期
- ///
- public DateTime CostDate { get; set; }
-
- ///
- /// 消费机器唯一信息
- ///
- public string DeviceUniqueNo { get; set; }
-
- ///
- /// 餐补月份
- ///
- public string SubsidiesFromMonth { get; set; }
-
- ///
- /// Ip
- ///
- public string IP { get; set; }
-
- ///
- /// 成本中心
- ///
- public string CostId { get; set; }
-
- ///
- /// 消费者所在基地
- ///
- public string OriginTenantId { get; set; }
-
- ///
- /// 成本计算是否允许跨基地范围
- ///
- public bool IsCostCrossTenant { get; set; }
-
- ///
- /// 数据状态
- ///
- public BalanceRecordStatusEnumType Status { get; set; }
-
- ///
- /// 数据状态CN
- ///
- public string StatusCN => Status.GetDescription();
-
- ///
- /// 消费时间
- ///
- public DateTime CostDateTime { get; set; }
-
- ///
- /// 备注
- ///
- public string Remark { get; set; }
-
- ///
- /// 餐饮应用类型
- ///
- public CanteenApplicaitonTypeEnumType ApplicationType { get; set; }
-
- ///
- /// 餐饮应用类型CN
- ///
- public string ApplicationTypeCN => ApplicationType.GetDescription();
-
-
- public string TenantId { get; set; }
- }
+ ///
+ /// 备注
+ ///
+ public string Remark { get; set; }
}
diff --git a/Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs b/Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs
index 7fab2de1..e9d9cc66 100644
--- a/Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs
+++ b/Src/Dlhis.Common/ApiLog/Services/ApiLogService.cs
@@ -20,7 +20,7 @@ namespace Dlhis.Common.ApiLog.Services
}
public async Task> GetLogsAsync(ApiLogRequest request)
- {
+ {
var logs = await _dbContext.ChangeDb("log").Queryable()
.WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search))
.WhereIF(request.Level.HasValue, x => x.Level == request.Level)
diff --git a/Src/Dlhis.Common/MealSupplementRecord/MealSupplementRecordController.cs b/Src/Dlhis.Common/MealSupplementRecord/MealSupplementRecordController.cs
deleted file mode 100644
index 225243b2..00000000
--- a/Src/Dlhis.Common/MealSupplementRecord/MealSupplementRecordController.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Dlhis.Common.Request;
-using Dlhis.Common.Response;
-using Dlhis.Common.Services;
-using Kurisu.Core.DataAccess.Dto;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Dlhis.Common.MealSupplementRecord
-{
- ///
- /// 餐补控制器
- ///
- [Authorize]
- [Route("api/[controller]")]
- [ApiController]
- public class MealSupplementRecordController
- {
- private readonly IMealSupplementRecordService _mealSupplementRecordService;
-
- public MealSupplementRecordController(IMealSupplementRecordService mealSupplementRecordService)
- {
- _mealSupplementRecordService = mealSupplementRecordService;
- }
-
- ///
- /// 餐补分页
- ///
- ///
- ///
- [HttpGet("mealSupplementRecordPage")]
- public async Task> MealSupplementRecordPageAsync([FromQuery]MealSupplementRecordRequest request)
- {
- return await _mealSupplementRecordService.MealSupplementRecordPageAsync(request);
- }
- }
-}
diff --git a/Src/Dlhis.Common/Request/MealSupplementRecordRequest.cs b/Src/Dlhis.Common/Request/MealSupplementRecordRequest.cs
deleted file mode 100644
index ce64bcce..00000000
--- a/Src/Dlhis.Common/Request/MealSupplementRecordRequest.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Kurisu.Core.DataAccess.Dto;
-
-namespace Dlhis.Common.Request
-{
- public class MealSupplementRecordRequest : PageDto
- {
-
- }
-}
diff --git a/Src/Dlhis.Common/Response/MealSupplementRecordResponse.cs b/Src/Dlhis.Common/Response/MealSupplementRecordResponse.cs
deleted file mode 100644
index c03d0277..00000000
--- a/Src/Dlhis.Common/Response/MealSupplementRecordResponse.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Dlhis.Entity.Basic.Enums;
-using SqlSugar.DbConvert;
-using SqlSugar;
-using Kurisu.AspNetCore.Utils.Extensions;
-
-namespace Dlhis.Common.Response
-{
- public class MealSupplementRecordResponse
- {
- ///
- /// 唯一号
- ///
- public string UniqueId { get; set; }
-
- ///
- /// 工号
- ///
- public string Code { get; set; }
-
- ///
- /// 餐补状态
- ///
- public MealSupplementStatusEnumtype Status { get; set; }
-
- ///
- /// 餐补状态CN
- ///
- public string StatusCN => Status.GetDescription();
-
- ///
- /// 考勤日期
- ///
- public DateTime Date { get; set; }
-
- ///
- /// 工作地
- ///
- public string Workplace { get; set; }
-
- ///
- /// 厂区
- ///
- public string Factory { get; set; }
-
- public string Remark { get; set; }
-
- ///
- /// 餐补
- ///
- public decimal Amount { get; set; }
-
- ///
- /// 处理结果
- ///
- public string Result { get; set; }
-
- ///
- /// 状态同步
- ///
- public bool Sync { get; set; }
- }
-}
diff --git a/Src/Dlhis.Common/Services/IMealSupplementRecordService.cs b/Src/Dlhis.Common/Services/IMealSupplementRecordService.cs
deleted file mode 100644
index c193b966..00000000
--- a/Src/Dlhis.Common/Services/IMealSupplementRecordService.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Dlhis.Common.Request;
-using Dlhis.Common.Response;
-using Kurisu.Core.DataAccess.Dto;
-
-namespace Dlhis.Common.Services
-{
- public interface IMealSupplementRecordService : IScopeDependency
- {
- Task> MealSupplementRecordPageAsync(MealSupplementRecordRequest request);
- }
-}
diff --git a/Src/Dlhis.Common/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Common/Services/Implements/MealSupplementRecordService.cs
deleted file mode 100644
index 60d908a3..00000000
--- a/Src/Dlhis.Common/Services/Implements/MealSupplementRecordService.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Dlhis.Common.Request;
-using Dlhis.Common.Response;
-using Dlhis.Entity.Basic.Entity;
-using Kurisu.AspNetCore.Utils.Extensions;
-using Kurisu.Core.DataAccess.Dto;
-using Kurisu.SqlSugar.Extensions;
-using Kurisu.SqlSugar.Services;
-
-namespace Dlhis.Common.Services.Implements
-{
- public class MealSupplementRecordService : IMealSupplementRecordService
- {
-
- private readonly IDbContext _dbContext;
-
- public MealSupplementRecordService(IDbContext dbContext)
- {
- _dbContext = dbContext;
- }
-
- public async Task> MealSupplementRecordPageAsync(MealSupplementRecordRequest request)
- {
- var page = await _dbContext.Queryable()
- .WhereIF(request.Search.IsPresent(), x => x.Code.Contains(request.Search))
- .Select()
- .ToPageListAsync(request);
-
- return page;
- }
- }
-}