fix 处理已知问题

Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs

@@ -17,25 +17,35 @@ namespace Dlhis.Basic.Device.Services.Implements;
 public class DeviceConnectService : IDeviceConnectService
 {
     private readonly IDbContext _dbContext;
-    private readonly IHttpContextAccessor _httpContextAccessor;
 
-    public DeviceConnectService(IDbContext dbContext, IHttpContextAccessor httpContextAccessor)
+    public DeviceConnectService(IDbContext dbContext)
     {
         _dbContext = dbContext;
-        _httpContextAccessor = httpContextAccessor;
     }
 
 
     public async Task<string> RegisterAsync(DeviceResigterRequest request)
     {
-        var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == request.BusinessCustomCode).FirstAsync();
+        var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == request.BusinessCustomCode).SingleAsync();
         businessPlace.ThrowIfNull("营业点不存在");
 
         var device = await GetEnableDeviceAsync(request.UniqueNo, false, request.DeployPlace, businessPlace.TenantId);
-        var registry = await _dbContext.Queryable<DeviceRegistryEntity>().Where(x => x.DeviceUniqueNo == request.UniqueNo).FirstAsync();
+        if (device.DeployPlace.Equals("AUTO", StringComparison.OrdinalIgnoreCase))
+        {
+            device.DeployPlace = businessPlace.Name;
+            await _dbContext.UpdateAsync(device);
+        }
+
+        var registry = await _dbContext.Queryable<DeviceRegistryEntity>().Where(x => x.DeviceUniqueNo == request.UniqueNo).SingleAsync();
 
         if (registry != null)
         {
+            registry.LastHeartbeatTime = DateTime.Now;
+            registry.RegisterTime = DateTime.Now;
+            registry.BusinessPlaceCode = businessPlace.Code;
+
+            await _dbContext.UpdateAsync(registry);
+            
             return "请勿重复注册设备";
         }
 
@@ -48,12 +58,6 @@ public class DeviceConnectService : IDeviceConnectService
             TenantId = device.TenantId
         };
 
-        if (device.DeployPlace == "AUTO")
-        {
-            device.DeployPlace = businessPlace.Name;
-            await _dbContext.UpdateAsync(device);
-        }
-
         await _dbContext.InsertAsync(registry);
         return "设备注册成功";
     }
@@ -156,9 +160,7 @@ public class DeviceConnectService : IDeviceConnectService
     /// <returns></returns>
     private async Task<DeviceEntity> GetEnableDeviceAsync(string uniqueNo, bool checkExists = true, string deployPlace = "", string tenantId = "")
     {
-        var device = await _dbContext.Queryable<DeviceEntity>()
+        var device = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == uniqueNo).SingleAsync();
-            .Where(x => x.UniqueNo == uniqueNo)
-            .FirstAsync();
 
         if (checkExists)
         {

Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs

@@ -121,7 +121,7 @@ public class BalancesController : ControllerBase
     /// <returns></returns>
     [HttpGet("user/group/page")]
     [IgnoreTenant]
-    public async Task<Pagination<BalanceRecordUserPageResponse>> GetUserBalanceGroupAsync([FromQuery] BalanceRecordUserGroupPageRequest request)
+    public async Task<Pagination<BalanceRecordResponse>> GetUserBalanceGroupAsync([FromQuery] BalanceRecordUserGroupPageRequest request)
     {
         return await _balanceService.GetUserBalanceGroupAsync(request);
     }

Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs

@@ -35,10 +35,20 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject
     [EnumDataType(typeof(GainfoStatusEnumType))]
     public GainfoStatusEnumType? GainfoStatus { get; set; }
 
+    /// <summary>
+    /// 用户工号
+    /// </summary>
+    public string UserCode { get; set; }
+    
+    /// <summary>
+    /// 用户名称
+    /// </summary>
+    public string UserName { get; set; }
+
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
         GainfoStatus ??= GainfoStatusEnumType.Working;
-        
+
         if (SearchDateTimePeriod?.End != null)
         {
             SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);

Src/Dlhis.Canteen/Order/Request/BalanceRecordUserGroupPageRequest.cs

@@ -18,7 +18,6 @@ public class BalanceRecordUserGroupPageRequest : PageDto, IValidatableObject
     [Required(ErrorMessage = "工号不可为空")]
     public string UserCode { get; set; }
 
-
     /// <summary>
     /// 消费类型
     /// </summary>

Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisShiftResponse.cs

@@ -17,4 +17,9 @@ public class BalanceRecordAnalysisShiftPageResponse
     public DateTime Date { get; set; }
 
     public List<ShiftSummaryDto<decimal>> Shifts { get; set; }
+
+    /// <summary>
+    /// 当天总额
+    /// </summary>
+    public decimal DateAmount => Shifts.Sum(x => x.Value);
 }

Src/Dlhis.Canteen/Order/Services/IBalanceService.cs

@@ -13,7 +13,7 @@ public interface IBalanceService : IScopeDependency
     Task<BalanceRecordUserResultResponse> GetPageByUserAsync(BalanceRecordUserPageRequest request);
 
 
-    Task<Pagination<BalanceRecordUserPageResponse>> GetUserBalanceGroupAsync(BalanceRecordUserGroupPageRequest request);
+    Task<Pagination<BalanceRecordResponse>> GetUserBalanceGroupAsync(BalanceRecordUserGroupPageRequest request);
     
 
     Task SupplementBalanceAsync(BalanceSupplementRequest request);

Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs

@@ -53,10 +53,11 @@ public class BalanceService : IBalanceService
             .LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
             .LeftJoin<CanteenOrderEntity>((record, ga, department, bPlace, order) => record.No == order.No)
             .WhereIF(request.Factory.IsPresent(), record => record.TenantId == request.Factory)
-            .WhereIF(request.Type.HasValue, record => record.Type == request.Type)
             .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
+            .WhereIF(request.Type.HasValue, record => record.Type == request.Type)
             .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType))
-            .WhereIF(request.Search.IsPresent(), (record, ga) => ga.Code == request.Search || ga.Name == request.Search)
+            .WhereIF(request.UserCode.IsPresent(), record => record.UserCode == request.UserCode)
+            .WhereIF(request.UserName.IsPresent(), record => record.Name == request.UserName)
             .OrderBy(record => record.CreateTime, OrderByType.Desc)
             .Select((record, ga, department, bPlace, order) => new BalanceRecordResponse
             {
@@ -381,27 +382,43 @@ public class BalanceService : IBalanceService
         };
     }
 
-    public async Task<Pagination<BalanceRecordUserPageResponse>> GetUserBalanceGroupAsync(BalanceRecordUserGroupPageRequest request)
+    public async Task<Pagination<BalanceRecordResponse>> GetUserBalanceGroupAsync(BalanceRecordUserGroupPageRequest request)
     {
         return await _dbContext.Queryable<BalanceRecordEntity>()
             .LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
+            //.LeftJoinIF<GainfoEntity>(request.GainfoStatus == GainfoStatusEnumType.Working, (record, ga) => record.UserNo == ga.No)
+            //.LeftJoinIF<GainfoLeaveEntity>(request.GainfoStatus == GainfoStatusEnumType.Leave, (record, ga) => record.UserNo == ga.No)
             .LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
             .LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
-            .Where((record, ga) => record.UserCode == request.UserCode)
+            .LeftJoin<CanteenOrderEntity>((record, ga, department, bPlace, order) => record.No == order.No)
-            .Where(record => record.Status == BalanceRecordStatusEnumType.Valid && record.Source != BalanceRecordSourceEnumType.EMealVoucher) //不展示电子餐券信息
+            .Where(record => record.UserCode == request.UserCode)
-            .WhereIF(request.Type.HasValue, record => record.Type == request.Type)
             .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
-            .OrderBy(record => record.CostDateTime)
+            .WhereIF(request.Type.HasValue, record => record.Type == request.Type)
-            .Select((record, ga, department, bPlace) => new BalanceRecordUserPageResponse
+            .OrderBy(record => record.CreateTime, OrderByType.Desc)
+            .Select((record, ga, department, bPlace, order) => new BalanceRecordResponse
             {
                 Id = record.Id,
-                CurrentAmount = SqlFunc.Abs(record.Amount),
-                Source = record.Source,
                 No = record.No,
+                IsOffline = order.IsOffline,
+                Amount = record.Amount,
+                CostDate = record.CostDate,
+                CostId = record.CostId,
+                DepartmentNo = record.DepartmentNo,
+                DeviceInfo = record.DeviceUniqueNo,
+                UserNo = record.UserNo,
+                UserCode = record.UserCode,
+                Type = record.Type,
+                Status = record.Status,
+                Source = record.Source,
+                OriginTenantId = record.OriginTenantId,
+                Name = record.Name,
+                DepartmentName = department.Name,
                 BusinessPlaceName = bPlace.Name,
-                ShiftType = record.ShiftType,
                 CostDateTime = record.CostDateTime,
-                ApplicationType = record.ApplicationType,
+                Factory = record.TenantId,
+                ShiftType = record.ShiftType,
+                Remark = record.Remark,
+                Werks = record.Werks
             })
             .ToPageListAsync(request);
     }

Src/Dlhis.Entity/Basic/Dto/FaceImageDetectionDto.cs

@@ -18,12 +18,12 @@ public class FaceImageDetectionDto
 public class FaceImageDetection
 {
     /// <summary>
-    /// 检查类型
+    /// 检查类型 FaceQualityTypeEnumType
     /// </summary>
     public FaceQualityTypeEnumType Type { get; set; }
 
     /// <summary>
-    /// 要求登记
+    /// 要求登记 FaceQualityLevelEnumType
     /// </summary>
     public FaceQualityLevelEnumType Level { get; set; }
 }