diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
index b0c93d1e..9649c414 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
@@ -1,9 +1,7 @@
using Dlhis.Basic.BusinessPlace.Request;
using Dlhis.Basic.BusinessPlace.Response;
using Dlhis.Basic.BusinessPlace.Services;
-using Dlhis.Basic.BusinessShift.Response;
using Dlhis.Basic.BusinessShift.Services;
-using Dlhis.Common.Api;
using Kurisu.Core.DataAccess.Dto;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -20,14 +18,12 @@ public class BusinessPlacesController : ControllerBase
{
private readonly IBusinessPlaceService _businessPlaceService;
private readonly IBusinessPlaceShiftService _businessPlaceShiftService;
- private readonly IEnumSettingApi _enumSettingApi;
public BusinessPlacesController(IBusinessPlaceService businessPlaceService,
- IBusinessPlaceShiftService businessPlaceShiftService, IEnumSettingApi enumSettingApi)
+ IBusinessPlaceShiftService businessPlaceShiftService)
{
_businessPlaceService = businessPlaceService;
_businessPlaceShiftService = businessPlaceShiftService;
- _enumSettingApi = enumSettingApi;
}
///
@@ -38,7 +34,6 @@ public class BusinessPlacesController : ControllerBase
[HttpGet("page")]
public async Task> GetPageAsync([FromQuery] BusinessPlacePageRequest request)
{
- //var enums = await _enumSettingApi.GetEnums();
return await _businessPlaceService.GetPageAsync(request);
}
@@ -66,11 +61,22 @@ public class BusinessPlacesController : ControllerBase
///
/// 根据手工号获取餐别
///
- ///
+ ///
+ ///
+ [HttpPost("shifts")]
+ public async Task GetShiftsByPlaceCustomCodeHttpPostAsync(BusinessPlaceGetShiftsRequest request)
+ {
+ return await _businessPlaceShiftService.GetShiftsByPlaceCustomCodeAsync(request.CustomCode);
+ }
+
+ ///
+ /// 根据手工号获取餐别
+ ///
+ ///
///
[HttpGet("shifts")]
- public async Task GetShiftsByPlaceCustomCodeAsync(string placeCustomCode)
+ public async Task GetShiftsByPlaceCustomCodeHttpGetAsync([FromQuery] BusinessPlaceGetShiftsRequest request)
{
- return await _businessPlaceShiftService.GetShiftsByPlaceCustomCodeAsync(placeCustomCode);
+ return await _businessPlaceShiftService.GetShiftsByPlaceCustomCodeAsync(request.CustomCode);
}
}
diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetShiftsRequest.cs b/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetShiftsRequest.cs
new file mode 100644
index 00000000..b2a0715e
--- /dev/null
+++ b/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetShiftsRequest.cs
@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.BusinessPlace.Request;
+
+public class BusinessPlaceGetShiftsRequest
+{
+ ///
+ /// 营业点手工号
+ ///
+ [Required(ErrorMessage = "营业点手工号不能为空")]
+ public string CustomCode { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs b/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs
index 51d6b1db..3b574c00 100644
--- a/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs
@@ -59,6 +59,12 @@ public class CanteenUserEntity : SugarBaseEntity, IVersion, ITenantId
[SugarColumn(ColumnDescription = "余额(餐补)")]
public decimal BalanceOfSubsidies { get; set; }
+
+ ///
+ /// 成本中心
+ ///
+ public string CostId { get; set; }
+
///
/// 版本号
///
diff --git a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
index 6ceb55a2..94c606e6 100644
--- a/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
+++ b/Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs
@@ -47,12 +47,6 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
[SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "来源")]
public BalanceRecordSourceEnumType Source { get; set; }
- ///
- /// 来源备注
- ///
- [SugarColumn(ColumnDescription = "来源备注")]
- public string SourceRemark { get; set; }
-
///
/// 收入/支出
///
@@ -70,13 +64,13 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
/// 营业点
///
[SugarColumn(ColumnDescription = "营业点")]
- public string BusinessPlaceCode { get; set; }
+ public Guid BusinessPlaceCode { get; set; }
///
/// 餐次
///
[SugarColumn(ColumnDescription = "餐次")]
- public string BusinessShiftCode { get; set; }
+ public Guid? BusinessShiftCode { get; set; }
///
/// 所属成本日期
diff --git a/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs
index ca5c0c51..cb56bdbc 100644
--- a/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs
+++ b/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs
@@ -8,16 +8,34 @@ namespace Dlhis.Entity.Canteen.Enums;
[Description("充值/消费来源")]
public enum BalanceRecordSourceEnumType
{
+ ///
+ /// 卡消费
+ ///
+ [Description("卡消费")]
+ Card = 100,
+
+ ///
+ /// 人脸消费
+ ///
+ [Description("人脸消费")]
+ Face,
+
+ ///
+ /// 二维码消费
+ ///
+ [Description("二维码消费")]
+ QrCode,
+
///
/// 来自微信
///
- [Description("来自微信")]
- Wechat,
+ [Description("微信")]
+ Wechat = 200,
///
/// 来自支付宝
///
- [Description("来自支付宝")]
+ [Description("支付宝")]
Alipay,
///
@@ -37,24 +55,4 @@ public enum BalanceRecordSourceEnumType
///
[Description("其他基地补贴")]
OtherTenantSubsidies,
-
-
- ///
- /// 餐厅
- ///
- [Description("餐厅")]
- Cateen,
-
- ///
- /// 食堂
- ///
- [Description("食堂")]
- Cafeteria,
-
- ///
- /// 超市
- ///
- [Description("超市")]
- Supermarket,
-
}
\ No newline at end of file
diff --git a/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordStatusEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordStatusEnumType.cs
index d8144b9d..7bb3a02f 100644
--- a/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordStatusEnumType.cs
+++ b/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordStatusEnumType.cs
@@ -12,12 +12,19 @@ public enum BalanceRecordStatusEnumType
///
/// 有效
///
- [Description("有效")]
+ [Description("有效数据")]
Valid = 1,
+
+ ///
+ /// 存疑
+ ///
+ [Description("存疑数据")]
+ Doubtful = 5,
+
///
/// 作废
///
- [Description("作废")]
- Absolute
+ [Description("作废数据")]
+ Absolute = 99
}
\ No newline at end of file
diff --git a/Src/Dlhis.Entity/Canteen/Enums/CanteenOrderStatusEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/CanteenOrderStatusEnumType.cs
index 923d8ac1..2a304386 100644
--- a/Src/Dlhis.Entity/Canteen/Enums/CanteenOrderStatusEnumType.cs
+++ b/Src/Dlhis.Entity/Canteen/Enums/CanteenOrderStatusEnumType.cs
@@ -9,14 +9,21 @@ namespace Dlhis.Entity.Canteen.Enums;
public enum CanteenOrderStatusEnumType
{
///
- /// 失败
+ /// 待处理
///
- [Description("失败")]
- Failure = 0,
+ [Description("待处理")]
+ Wait = 0,
///
/// 成功
///
[Description("成功")]
- Successful,
+ Successful = 1,
+
+
+ ///
+ /// 失败
+ ///
+ [Description("失败")]
+ Failure = 99,
}
\ No newline at end of file
diff --git a/Src/Dlhis.Entity/Canteen/Enums/CanteenSettingItemEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/CanteenSettingItemEnumType.cs
index 0d417103..8dfbaded 100644
--- a/Src/Dlhis.Entity/Canteen/Enums/CanteenSettingItemEnumType.cs
+++ b/Src/Dlhis.Entity/Canteen/Enums/CanteenSettingItemEnumType.cs
@@ -58,7 +58,7 @@ public enum CanteenSettingItemEnumType
///
/// 允许一餐次多次消费
///
- [Description("允许一餐次多次消费(T/F)")]
+ [Description("允许一餐次多次消费(1/0)")]
AllowRepeatInOneShift,
///
@@ -71,7 +71,7 @@ public enum CanteenSettingItemEnumType
///
/// 允许跨基地消费
///
- [Description("允许跨基地消费(T/F)")]
+ [Description("允许跨基地消费(1/0)")]
AllowCrossTenant,
///
diff --git a/Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs
new file mode 100644
index 00000000..d42760ac
--- /dev/null
+++ b/Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs
@@ -0,0 +1,42 @@
+using System.ComponentModel;
+
+namespace Dlhis.Entity.Canteen.Enums;
+
+public enum DateTimeSearchEnumType
+{
+ ///
+ /// 当天
+ ///
+ [Description("当天")]
+ Day = 1,
+
+ ///
+ /// 本周
+ ///
+ [Description("本周")]
+ Week,
+
+ ///
+ /// 本月
+ ///
+ [Description("本月")]
+ Month,
+
+ ///
+ /// 本季度
+ ///
+ [Description("本季度")]
+ Season,
+
+ ///
+ /// 过去半年
+ ///
+ [Description("过去半年")]
+ HalfOfYear,
+
+ ///
+ /// 今年
+ ///
+ [Description("今年")]
+ Year
+}
diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs b/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs
new file mode 100644
index 00000000..e472e9ae
--- /dev/null
+++ b/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs
@@ -0,0 +1,41 @@
+using SqlSugar;
+
+namespace Dlhis.Entity.Device.Entities;
+
+///
+/// 设备任务表
+///
+[SugarTable(TableName = "DeviceTask")]
+public class DeviceTaskEntity : SugarBaseEntity
+{
+ ///
+ /// 用户档案号
+ ///
+ public string UserId { get; set; }
+
+ ///
+ /// 用户学工号
+ ///
+ public string UserCode { get; set; }
+
+ ///
+ /// 用户名
+ ///
+ public string UserName { get; set; }
+
+ ///
+ /// 设备唯一号
+ ///
+ public string DeviceUniqueNo { get; set; }
+
+ ///
+ /// 重试次数
+ ///
+ public int RetryCount { get; set; }
+
+
+ ///
+ /// 处理结果
+ ///
+ public string ResultMessage { get; set; }
+}