Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

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;
     }
 
     /// <summary>
@@ -38,7 +34,6 @@ public class BusinessPlacesController : ControllerBase
     [HttpGet("page")]
     public async Task<Pagination<BusinessPlaceResponse>> GetPageAsync([FromQuery] BusinessPlacePageRequest request)
     {
-        //var enums = await _enumSettingApi.GetEnums();
         return await _businessPlaceService.GetPageAsync(request);
     }
 
@@ -66,11 +61,22 @@ public class BusinessPlacesController : ControllerBase
     /// <summary>
     /// 根据手工号获取餐别
     /// </summary>
-    /// <param name="placeCustomCode"></param>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost("shifts")]
+    public async Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeHttpPostAsync(BusinessPlaceGetShiftsRequest request)
+    {
+        return await _businessPlaceShiftService.GetShiftsByPlaceCustomCodeAsync(request.CustomCode);
+    }
+
+    /// <summary>
+    /// 根据手工号获取餐别
+    /// </summary>
+    /// <param name="request"></param>
     /// <returns></returns>
     [HttpGet("shifts")]
-    public async Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeAsync(string placeCustomCode)
+    public async Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeHttpGetAsync([FromQuery] BusinessPlaceGetShiftsRequest request)
     {
-        return await _businessPlaceShiftService.GetShiftsByPlaceCustomCodeAsync(placeCustomCode);
+        return await _businessPlaceShiftService.GetShiftsByPlaceCustomCodeAsync(request.CustomCode);
     }
 }

Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetShiftsRequest.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dlhis.Basic.BusinessPlace.Request;
+
+public class BusinessPlaceGetShiftsRequest
+{
+    /// <summary>
+    /// 营业点手工号
+    /// </summary>
+    [Required(ErrorMessage = "营业点手工号不能为空")]
+    public string CustomCode { get; set; }
+}

Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs

@@ -59,6 +59,12 @@ public class CanteenUserEntity : SugarBaseEntity, IVersion, ITenantId
     [SugarColumn(ColumnDescription = "余额(餐补)")]
     public decimal BalanceOfSubsidies { get; set; }
 
+
+    /// <summary>
+    /// 成本中心
+    /// </summary>
+    public string CostId { get; set; }
+
     /// <summary>
     /// 版本号
     /// </summary>

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; }
 
-    /// <summary>
-    /// 来源备注
-    /// </summary>
-    [SugarColumn(ColumnDescription = "来源备注")]
-    public string SourceRemark { get; set; }
-
     /// <summary>
     /// 收入/支出
     /// </summary>
@@ -70,13 +64,13 @@ public class BalanceRecordEntity : SugarBaseEntity, ITenantId
     /// 营业点
     /// </summary>
     [SugarColumn(ColumnDescription = "营业点")]
-    public string BusinessPlaceCode { get; set; }
+    public Guid BusinessPlaceCode { get; set; }
 
     /// <summary>
     /// 餐次
     /// </summary>
     [SugarColumn(ColumnDescription = "餐次")]
-    public string BusinessShiftCode { get; set; }
+    public Guid? BusinessShiftCode { get; set; }
 
     /// <summary>
     /// 所属成本日期

Src/Dlhis.Entity/Canteen/Enums/BalanceRecordSourceEnumType.cs

@@ -8,16 +8,34 @@ namespace Dlhis.Entity.Canteen.Enums;
 [Description("充值/消费来源")]
 public enum BalanceRecordSourceEnumType
 {
+    /// <summary>
+    /// 卡消费
+    /// </summary>
+    [Description("卡消费")]
+    Card = 100,
+
+    /// <summary>
+    /// 人脸消费
+    /// </summary>
+    [Description("人脸消费")]
+    Face,
+
+    /// <summary>
+    /// 二维码消费
+    /// </summary>
+    [Description("二维码消费")]
+    QrCode,
+
     /// <summary>
     /// 来自微信
     /// </summary>
-    [Description("来自微信")]
+    [Description("微信")]
-    Wechat,
+    Wechat = 200,
 
     /// <summary>
     /// 来自支付宝
     /// </summary>
-    [Description("来自支付宝")]
+    [Description("支付宝")]
     Alipay,
 
     /// <summary>
@@ -37,24 +55,4 @@ public enum BalanceRecordSourceEnumType
     /// </summary>
     [Description("其他基地补贴")]
     OtherTenantSubsidies,
-
-
-    /// <summary>
-    /// 餐厅
-    /// </summary>
-    [Description("餐厅")]
-    Cateen,
-
-    /// <summary>
-    /// 食堂
-    /// </summary>
-    [Description("食堂")]
-    Cafeteria,
-
-    /// <summary>
-    /// 超市
-    /// </summary>
-    [Description("超市")]
-    Supermarket,
-
 }

Src/Dlhis.Entity/Canteen/Enums/BalanceRecordStatusEnumType.cs

@@ -12,12 +12,19 @@ public enum BalanceRecordStatusEnumType
     /// <summary>
     /// 有效
     /// </summary>
-    [Description("有效")]
+    [Description("有效数据")]
     Valid = 1,
 
+
+    /// <summary>
+    /// 存疑
+    /// </summary>
+    [Description("存疑数据")]
+    Doubtful = 5,
+
     /// <summary>
     /// 作废
     /// </summary>
-    [Description("作废")]
+    [Description("作废数据")]
-    Absolute
+    Absolute = 99
 }

Src/Dlhis.Entity/Canteen/Enums/CanteenOrderStatusEnumType.cs

@@ -9,14 +9,21 @@ namespace Dlhis.Entity.Canteen.Enums;
 public enum CanteenOrderStatusEnumType
 {
     /// <summary>
-    /// 失败
+    /// 待处理
     /// </summary>
-    [Description("失败")]
+    [Description("待处理")]
-    Failure = 0,
+    Wait = 0,
 
     /// <summary>
     /// 成功
     /// </summary>
     [Description("成功")]
-    Successful,
+    Successful = 1,
+
+
+    /// <summary>
+    /// 失败
+    /// </summary>
+    [Description("失败")]
+    Failure = 99,
 }

Src/Dlhis.Entity/Canteen/Enums/CanteenSettingItemEnumType.cs

@@ -58,7 +58,7 @@ public enum CanteenSettingItemEnumType
     /// <summary>
     /// 允许一餐次多次消费
     /// </summary>
-    [Description("允许一餐次多次消费(T/F)")]
+    [Description("允许一餐次多次消费(1/0)")]
     AllowRepeatInOneShift,
 
     /// <summary>
@@ -71,7 +71,7 @@ public enum CanteenSettingItemEnumType
     /// <summary>
     /// 允许跨基地消费
     /// </summary>
-    [Description("允许跨基地消费(T/F)")]
+    [Description("允许跨基地消费(1/0)")]
     AllowCrossTenant,
 
     /// <summary>

Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs

@@ -0,0 +1,42 @@
+using System.ComponentModel;
+
+namespace Dlhis.Entity.Canteen.Enums;
+
+public enum DateTimeSearchEnumType
+{
+    /// <summary>
+    /// 当天
+    /// </summary>
+    [Description("当天")]
+    Day = 1,
+
+    /// <summary>
+    /// 本周
+    /// </summary>
+    [Description("本周")]
+    Week,
+
+    /// <summary>
+    /// 本月
+    /// </summary>
+    [Description("本月")]
+    Month,
+
+    /// <summary>
+    /// 本季度
+    /// </summary>
+    [Description("本季度")]
+    Season,
+
+    /// <summary>
+    /// 过去半年
+    /// </summary>
+    [Description("过去半年")]
+    HalfOfYear,
+
+    /// <summary>
+    /// 今年
+    /// </summary>
+    [Description("今年")]
+    Year
+}

Src/Dlhis.Entity/Device/Entities/DeviceTask.cs

@@ -0,0 +1,41 @@
+using SqlSugar;
+
+namespace Dlhis.Entity.Device.Entities;
+
+/// <summary>
+/// 设备任务表
+/// </summary>
+[SugarTable(TableName = "DeviceTask")]
+public class DeviceTaskEntity : SugarBaseEntity
+{
+    /// <summary>
+    /// 用户档案号
+    /// </summary>
+    public string UserId { get; set; }
+
+    /// <summary>
+    /// 用户学工号
+    /// </summary>
+    public string UserCode { get; set; }
+
+    /// <summary>
+    /// 用户名
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// 设备唯一号
+    /// </summary>
+    public string DeviceUniqueNo { get; set; }
+
+    /// <summary>
+    /// 重试次数
+    /// </summary>
+    public int RetryCount { get; set; }
+
+
+    /// <summary>
+    /// 处理结果
+    /// </summary>
+    public string ResultMessage { get; set; }
+}