diff --git a/Src/Dlhis.Basic/Organization/Controllers/WerksController.cs b/Src/Dlhis.Basic/Organization/Controllers/WerksController.cs index 0cfb14fe..72066039 100644 --- a/Src/Dlhis.Basic/Organization/Controllers/WerksController.cs +++ b/Src/Dlhis.Basic/Organization/Controllers/WerksController.cs @@ -28,7 +28,7 @@ public class WerksController : ControllerBase /// /// [HttpGet("page")] - public async Task> GetPageAsync([FromQuery] PageDto request) + public async Task> GetPageAsync([FromQuery] PageDto request) { return await _werkService.GetPageAsync(request); } diff --git a/Src/Dlhis.Basic/Organization/Response/WerkPageResponse.cs b/Src/Dlhis.Basic/Organization/Response/WerkPageResponse.cs new file mode 100644 index 00000000..82105723 --- /dev/null +++ b/Src/Dlhis.Basic/Organization/Response/WerkPageResponse.cs @@ -0,0 +1,46 @@ +namespace Dlhis.Basic.Organization.Response; + +public class WerkPageResponse +{ + public long Id { get; set; } + + /// + /// 人事范围 + /// + public string Werk { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 是否启用 + /// + public bool Enable { get; set; } + + /// + /// 获取总人数 + /// + public int Total { get; set; } + + /// + /// 最近同步差异数 + /// + public int DiffNumber { get; set; } + + /// + /// 最近同步时间 + /// + public DateTime? LastSyncStartTime { get; set; } + + /// + /// 最近同步时间 + /// + public DateTime? LastSyncEndTime { get; set; } + + /// + /// 处理消息 + /// + public string HandleMessage { get; set; } +} diff --git a/Src/Dlhis.Basic/Organization/Response/WerkResponse.cs b/Src/Dlhis.Basic/Organization/Response/WerkResponse.cs deleted file mode 100644 index 6f1cf331..00000000 --- a/Src/Dlhis.Basic/Organization/Response/WerkResponse.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace Dlhis.Basic.Organization.Response; - -public class WerkResponse -{ - public long Id { get; set; } - - /// - /// 人事范围 - /// - public string Werk { get; set; } - - /// - /// 名称 - /// - public string Name { get; set; } - - /// - /// 是否启用 - /// - public bool Enable { get; set; } -} diff --git a/Src/Dlhis.Basic/Organization/Services/IWerkService.cs b/Src/Dlhis.Basic/Organization/Services/IWerkService.cs index 087f5bc2..ac34ff7b 100644 --- a/Src/Dlhis.Basic/Organization/Services/IWerkService.cs +++ b/Src/Dlhis.Basic/Organization/Services/IWerkService.cs @@ -6,7 +6,7 @@ namespace Dlhis.Basic.Organization.Services; public interface IWerkService : IScopeDependency { - Task> GetPageAsync(PageDto request); + Task> GetPageAsync(PageDto request); Task SaveAsync(WerkRequest request); } diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/WerkService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/WerkService.cs index 58acac62..45f9d267 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/WerkService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/WerkService.cs @@ -18,11 +18,11 @@ public class WerkService : IWerkService _dbContext = dbContext; } - public async Task> GetPageAsync(PageDto request) + public async Task> GetPageAsync(PageDto request) { return await _dbContext.Queryable() .WhereIF(request.Search.IsPresent(), x => x.Name.Contains(request.Search)) - .Select() + .Select() .ToPageListAsync(request); }