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

fix 例外人员设备type增加

Browse Source
This commit is contained in:
liguoyang
2025-04-24 15:37:40 +08:00
parent d96cd44ffd
commit 994318940d
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Dlhis.Basic/Device/Controllers/DevicePermissionManuallyController.cs
View File

@@ -23,13 +23,13 @@ public class DevicePermissionManuallyController : ControllerBase
/// <summary>
/// 数据分页
/// </summary>
/// <param name="requestDto"></param>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("page")]
[DataPermission]
public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync([FromQuery] PageDto requestDto)
public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync([FromQuery] DevicePermissionManuallyRequest request)
{
return await _devicePermissionService.GetPageAsync(requestDto);
return await _devicePermissionService.GetPageAsync(request);
}
/// <summary>

11
Src/Dlhis.Basic/Device/Request/DevicePermissionManuallyRequest.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Dlhis.Entity.Device.Enums;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Device.Request;
public class DevicePermissionManuallyRequest : PageDto
{
[EnumDataType(typeof(DeviceTypeEnumType))]
public DeviceTypeEnumType? Type { get; set; }
}

6
Src/Dlhis.Basic/Device/Response/DevicePermissionManuallyResponse.cs
View File

@@ -1,3 +1,6 @@
using Dlhis.Entity.Device.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.Basic.Device.Response;
public class DevicePermissionManuallyResponse
@@ -8,4 +11,7 @@ public class DevicePermissionManuallyResponse
public string DeployPlace { get; set; }
public string UserNo { get; set; }
public string UserName { get; set; }
public DeviceTypeEnumType Type { get; set; }
public string TypeDesc => Type.GetDescription();
}

2
Src/Dlhis.Basic/Device/Services/IDevicePermissionManuallyService.cs
View File

@@ -14,7 +14,7 @@ public interface IDevicePermissionManuallyService : IScopeDependency
/// </summary>
/// <param name="requestDto"></param>
/// <returns></returns>
Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(PageDto requestDto);
Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(DevicePermissionManuallyRequest requestDto);
/// <summary>
/// 添加例外

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

@@ -21,12 +21,13 @@ public class DevicePermissionManuallyService : IDevicePermissionManuallyService
}
/// <inheritdoc />
public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(PageDto requestDto)
public async Task<Pagination<DevicePermissionManuallyResponse>> GetPageAsync(DevicePermissionManuallyRequest requestDto)
{
return await _dbContext.Queryable<DevicePermissionManuallyEntity>()
.LeftJoin<DeviceEntity>((x, d) => x.DeviceCode == d.Code)
.LeftJoin<GainfoEntity>((x, d, g) => x.UserNo == g.No)
.WhereIF(requestDto.Search.IsPresent(), (x, d, g) => g.Code == requestDto.Search || g.Name.Contains(requestDto.Search))
.WhereIF(requestDto.Type.HasValue, (x, d, g) => d.Type == requestDto.Type)
.Select((x, d, g) => new DevicePermissionManuallyResponse
{
Id = x.Id,
@@ -34,7 +35,8 @@ public class DevicePermissionManuallyService : IDevicePermissionManuallyService
DeviceUniqueNo = d.UniqueNo,
DeployPlace = d.DeployPlace,
UserNo = x.UserNo,
UserName = g.Code + " " + g.Name
UserName = g.Code + " " + g.Name,
Type = d.Type
})
.ToPageListAsync(requestDto);
}