yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 字段修改,消费记录设备查询增加日期

Browse Source
This commit is contained in:
liguoyang
2024-01-11 15:22:30 +08:00
parent 212aa2b65d
commit 6af019485d
13 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
View File

@@ -36,6 +36,6 @@ public class DevicePermissionsController : ControllerBase
[HttpGet("assignments")]
public async Task<List<Guid>> GetAssignmentsAsync(DeviceGetAssignmentsRequest request)
{
return await _devicePermissionService.GetAssignmentsAsync(request.UserId, request.UniqueType, request.UniqueValue);
return await _devicePermissionService.GetAssignmentsAsync(request.UserNo, request.UniqueType, request.UniqueValue);
}
}

2
Src/Dlhis.Basic/Device/Request/DeviceGetAssignmentsRequest.cs
View File

@@ -9,7 +9,7 @@ public class DeviceGetAssignmentsRequest
/// 用户档案号
/// </summary>
[Required]
public string UserId { get; set; }
public string UserNo { get; set; }
/// <summary>
/// 权限分配类型 MenuAssignmentTypeEnumType

2
Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs
View File

@@ -9,7 +9,7 @@ public class DevicePermissionSaveReuqest
/// 人员档案号
/// </summary>
[Required(ErrorMessage = "人员档案号不能为空")]
public string UserId { get; set; }
public string UserNo { get; set; }
/// <summary>
/// 分配权限类型 DevicePermissionTypeEnumType

6
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -21,7 +21,7 @@ public class DevicePermissionService : IDevicePermissionService
var permissions = await _dbContext.Queryable<DevicePermissionEntity>()
.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<DevicePermissionEntity>()
.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();

2
Src/Dlhis.Basic/MealUser/Request/MealUserAddRequest.cs
View File

@@ -9,7 +9,7 @@ public class MealUserAddRequest
/// 档案号
/// </summary>
[Required(ErrorMessage = "档案号不能为空")]
public string UserId { get; set; }
public string UserNo { get; set; }
/// <summary>

6
Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs
View File

@@ -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,

2
Src/Dlhis.Basic/Organization/Request/GainfoDImissionRequest.cs
View File

@@ -8,6 +8,6 @@ namespace Dlhis.Basic.Organization.Request
/// 档案号
/// </summary>
[Required(ErrorMessage = "档案号不能为空")]
public string UserId { get; set; }
public string UserNo { get; set; }
}
}

4
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -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($"该档案不存在");

5
Src/Dlhis.Canteen/Order/Request/BalanceRecordPageByDeviceUniqueNoRequest.cs
View File

@@ -10,4 +10,9 @@ public class BalanceRecordPageByDeviceUniqueNoRequest : PageDto
/// </summary>
[Required(ErrorMessage = "设备唯一号不能为空")]
public string DeviceUniqueNo { get; set; }
/// <summary>
/// 查询日期
/// </summary>
public DateTime? SearchDate { get; set; }
}

17
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -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<CanteenBusinessShiftEntity>((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<DeviceEntity>()
.Where(x => x.UniqueNo == request.DeviceUniqueNo || x.Code == Guid.Parse(request.DeviceUniqueNo))
.FirstAsync();
if (device == null)
{
return new Pagination<BalanceRecordResponse>()
@@ -81,10 +90,10 @@ public class BalanceService : IBalanceService
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<CanteenBusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<CanteenBusinessShiftEntity>((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,

2
Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs
View File

@@ -16,7 +16,7 @@ public class DevicePermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
/// 人员档案
/// </summary>
[SugarColumn(ColumnDescription = "人员档案")]
public string UserId { get; set; }
public string UserNo { get; set; }
/// <summary>
/// 设备权限类型

2
Src/Dlhis.User/Identity/Request/UserAvatarUploadRequest.cs
View File

@@ -8,7 +8,7 @@ public class UserAvatarUploadRequest
/// 用户id
/// </summary>
[Range(1, int.MaxValue)]
public int UserId { get; set; }
public int UserNo { get; set; }
/// <summary>
/// 图片地址

2
Src/Dlhis.User/Identity/Services/Implements/UserService.cs
View File

@@ -54,6 +54,6 @@ public class UserService : IUserService
public async Task UploadUserAvatarAsync(UserAvatarUploadRequest request)
{
var user = await _dbContext.Queryable<UserEntity>().Where(x => x.Id == request.UserId).Select<UserResponse>().FirstAsync();
var user = await _dbContext.Queryable<UserEntity>().Where(x => x.Id == request.UserNo).Select<UserResponse>().FirstAsync();
}
}