diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs index 28e6321f..898fbc86 100644 --- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs +++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs @@ -36,6 +36,6 @@ public class DevicePermissionsController : ControllerBase [HttpGet("assignments")] public async Task> GetAssignmentsAsync(DeviceGetAssignmentsRequest request) { - return await _devicePermissionService.GetAssignmentsAsync(request.UserId, request.UniqueType, request.UniqueValue); + return await _devicePermissionService.GetAssignmentsAsync(request.UserNo, request.UniqueType, request.UniqueValue); } } diff --git a/Src/Dlhis.Basic/Device/Request/DeviceGetAssignmentsRequest.cs b/Src/Dlhis.Basic/Device/Request/DeviceGetAssignmentsRequest.cs index 7394cda1..f0f41bd5 100644 --- a/Src/Dlhis.Basic/Device/Request/DeviceGetAssignmentsRequest.cs +++ b/Src/Dlhis.Basic/Device/Request/DeviceGetAssignmentsRequest.cs @@ -9,7 +9,7 @@ public class DeviceGetAssignmentsRequest /// 用户档案号 /// [Required] - public string UserId { get; set; } + public string UserNo { get; set; } /// /// 权限分配类型 MenuAssignmentTypeEnumType diff --git a/Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs b/Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs index b3899be0..e115b57d 100644 --- a/Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs +++ b/Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs @@ -9,7 +9,7 @@ public class DevicePermissionSaveReuqest /// 人员档案号 /// [Required(ErrorMessage = "人员档案号不能为空")] - public string UserId { get; set; } + public string UserNo { get; set; } /// /// 分配权限类型 DevicePermissionTypeEnumType diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 40b2e442..504a19f2 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -21,7 +21,7 @@ public class DevicePermissionService : IDevicePermissionService var permissions = await _dbContext.Queryable() .Where(x => x.UniqueType == item.UniqueType) .Where(x => x.UniqueValue == item.UniqueValue) - .Where(x => x.UserId == item.UserId) + .Where(x => x.UserNo == item.UserNo) .ToListAsync(); //todo 差异数据 @@ -29,7 +29,7 @@ public class DevicePermissionService : IDevicePermissionService await _dbContext.InsertAsync(new DevicePermissionEntity { - UserId = item.UserId, + UserNo = item.UserNo, UniqueType = item.UniqueType, UniqueValue = item.UniqueValue, }); @@ -41,7 +41,7 @@ public class DevicePermissionService : IDevicePermissionService var assignments = await _dbContext.Queryable() .Where(x => x.UniqueType == uniqueType) .WhereIF(uniqueValue.HasValue, x => x.UniqueValue == uniqueValue) - .Where(x => x.UserId == userId) + .Where(x => x.UserNo == userId) .Select(x => x.UniqueValue) .ToListAsync(); diff --git a/Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs b/Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs index 8ce9e905..f4ee6ccc 100644 --- a/Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs +++ b/Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs @@ -9,7 +9,7 @@ public class MealUserAddRequest /// 档案号 /// [Required(ErrorMessage = "档案号不能为空")] - public string UserId { get; set; } + public string UserNo { get; set; } /// diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs index d62df67e..f87d7dba 100644 --- a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs +++ b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs @@ -35,14 +35,14 @@ public class MealUserService : IMealUserService //todo 获取档案信息 var gainfoEntity = await _gainfoStore.Queryable(GainfoStatusEnumType.Working) - .Where(x => x.No.ToString() == request.UserId) + .Where(x => x.No.ToString() == request.UserNo) .FirstAsync(); - gainfoEntity.ThrowIfNull($"档案[{request.UserId}]不存在"); + gainfoEntity.ThrowIfNull($"档案[{request.UserNo}]不存在"); var entity = new CanteenUserEntity { - UserNo = request.UserId, + UserNo = request.UserNo, UserType = request.UserType, UserCode = gainfoEntity.Code, CarNo = gainfoEntity.CarNo, diff --git a/Src/Dlhis.Basic/Organization/Request/GainfoDImissionRequest.cs b/Src/Dlhis.Basic/Organization/Request/GainfoDImissionRequest.cs index c60941be..6d56fcd7 100644 --- a/Src/Dlhis.Basic/Organization/Request/GainfoDImissionRequest.cs +++ b/Src/Dlhis.Basic/Organization/Request/GainfoDImissionRequest.cs @@ -8,6 +8,6 @@ namespace Dlhis.Basic.Organization.Request /// 档案号 /// [Required(ErrorMessage = "档案号不能为空")] - public string UserId { get; set; } + public string UserNo { get; set; } } } diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index ab4afbf5..308efe1d 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -86,7 +86,7 @@ public class GainfoService : IGainfoService public async Task DimissionAsync(GainfoDImissionRequest request) { var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working) - .Where(x => x.No == request.UserId) + .Where(x => x.No == request.UserNo) .FirstAsync(); gainfo.ThrowIfNull("该档案不存在"); @@ -106,7 +106,7 @@ public class GainfoService : IGainfoService public async Task OnboardingAsync(GainfoDImissionRequest request) { var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.External) - .Where(x => x.No == request.UserId) + .Where(x => x.No == request.UserNo) .FirstAsync(); gainfo.ThrowIfNull($"该档案不存在"); diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs index 5ce29b4b..ef9f89d1 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs @@ -10,4 +10,9 @@ public class BalanceRecordPageByDeviceUniqueNoRequest : PageDto /// [Required(ErrorMessage = "设备唯一号不能为空")] public string DeviceUniqueNo { get; set; } + + /// + /// 查询日期 + /// + public DateTime? SearchDate { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index e4a9aba2..2beb3444 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -6,6 +6,7 @@ using Kurisu.Core.DataAccess.Dto; using Kurisu.SqlSugar.Attributes; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; +using SqlSugar; namespace Dlhis.Canteen.Order.Services.Implements; @@ -27,7 +28,7 @@ public class BalanceService : IBalanceService .LeftJoin((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code) .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CreateTime >= request.SearchDateTimePeriod.Start) .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CreateTime <= request.SearchDateTimePeriod.End) - .OrderBy(record => record.CreateTime) + .OrderBy(record => record.CreateTime, OrderByType.Desc) .Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse { Id = record.Id, @@ -65,9 +66,17 @@ public class BalanceService : IBalanceService var start = DateTime.Today; var end = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59); + if (request.SearchDate.HasValue) + { + now = request.SearchDate.Value; + start = new DateTime(now.Year, now.Month, now.Day, 0, 0, 1); + end = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59); + } + var device = await _dbContext.Queryable() .Where(x => x.UniqueNo == request.DeviceUniqueNo || x.Code == Guid.Parse(request.DeviceUniqueNo)) .FirstAsync(); + if (device == null) { return new Pagination() @@ -81,10 +90,10 @@ public class BalanceService : IBalanceService .LeftJoin((record, ga, department) => ga.DepartmentNo == department.No) .LeftJoin((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code) .LeftJoin((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code) - .Where(record => record.CreateTime >= start) - .Where(record => record.CreateTime <= end) + .WhereIF(request.SearchDate.HasValue, record => record.CreateTime >= start) + .WhereIF(request.SearchDate.HasValue, record => record.CreateTime <= end) .Where(record => record.DeviceInfo == device.Code.ToString() && record.TenantId == device.TenantId) - .OrderBy(record => record.CreateTime) + .OrderBy(record => record.CreateTime, OrderByType.Desc) .Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse { Id = record.Id, diff --git a/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs b/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs index 185c1746..c6f98596 100644 --- a/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs +++ b/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs @@ -16,7 +16,7 @@ public class DevicePermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted /// 人员档案 /// [SugarColumn(ColumnDescription = "人员档案")] - public string UserId { get; set; } + public string UserNo { get; set; } /// /// 设备权限类型 diff --git a/Src/Dlhis.User/Identity/Request/UserAvatarUploadRequest.cs b/Src/Dlhis.User/Identity/Request/UserAvatarUploadRequest.cs index d4b9dcce..319f97ae 100644 --- a/Src/Dlhis.User/Identity/Request/UserAvatarUploadRequest.cs +++ b/Src/Dlhis.User/Identity/Request/UserAvatarUploadRequest.cs @@ -8,7 +8,7 @@ public class UserAvatarUploadRequest /// 用户id /// [Range(1, int.MaxValue)] - public int UserId { get; set; } + public int UserNo { get; set; } /// /// 图片地址 diff --git a/Src/Dlhis.User/Identity/Services/Implements/UserService.cs b/Src/Dlhis.User/Identity/Services/Implements/UserService.cs index 033bb762..4845f537 100644 --- a/Src/Dlhis.User/Identity/Services/Implements/UserService.cs +++ b/Src/Dlhis.User/Identity/Services/Implements/UserService.cs @@ -54,6 +54,6 @@ public class UserService : IUserService public async Task UploadUserAvatarAsync(UserAvatarUploadRequest request) { - var user = await _dbContext.Queryable().Where(x => x.Id == request.UserId).Select().FirstAsync(); + var user = await _dbContext.Queryable().Where(x => x.Id == request.UserNo).Select().FirstAsync(); } }