diff --git a/WGShare.API/Controllers/Frontend/HomeController.cs b/WGShare.API/Controllers/Frontend/HomeController.cs index 3f56a75..03c4a87 100644 --- a/WGShare.API/Controllers/Frontend/HomeController.cs +++ b/WGShare.API/Controllers/Frontend/HomeController.cs @@ -63,8 +63,8 @@ namespace WGShare.API.Controllers.Frontend var list = await _sqlSugar.Queryable() .Where(x => x.TenantId == TenantId && x.IsDelete == false) - .WhereIF(Year > 0, x => x.Year == Year) - .WhereIF(Subject > 0, x => x.Subject == Subject) + .WhereIF(Year > 0, x => x.Year == Year || x.Year == 0) + .WhereIF(Subject > 0, x => x.Subject == Subject || x.Subject == 0) .OrderBy(x => x.Id, OrderByType.Desc) .ToPageListAsync(dto.PageIndex, dto.PageSize, total); @@ -109,6 +109,19 @@ namespace WGShare.API.Controllers.Frontend return await _sqlSugar.Insertable(entity).ExecuteCommandAsync() > 0; } + /// + /// 更新会议室信息 + /// + /// + /// + [HttpPut("room-info")] + public async Task ModifyRoom([FromBody] RoomInfoInputDTO inputDTO) + { + var entity = inputDTO.Adapt(); + return await _sqlSugar.Updateable(entity) + .UpdateColumns(x => new { x.Year, x.Subject }) + .ExecuteCommandHasChangeAsync(); + } /// /// 删除会议室 diff --git a/WGShare.API/WGShare.API.xml b/WGShare.API/WGShare.API.xml index 2ebda6e..1a15c3f 100644 --- a/WGShare.API/WGShare.API.xml +++ b/WGShare.API/WGShare.API.xml @@ -102,6 +102,13 @@ + + + 更新会议室信息 + + + + 删除会议室 diff --git a/WGShare.Domain/DTOs/Room/RoomInputDTO.cs b/WGShare.Domain/DTOs/Room/RoomInputDTO.cs index 428323c..4bb5ec5 100644 --- a/WGShare.Domain/DTOs/Room/RoomInputDTO.cs +++ b/WGShare.Domain/DTOs/Room/RoomInputDTO.cs @@ -4,21 +4,43 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using WGShare.Domain.Enums; using Yitter.IdGenerator; namespace WGShare.Domain.DTOs.Room { - public class RoomInputDTO - { + public class RoomInputDTO : RoomInfoInputDTO + { /// /// 会议室名称 - /// - [SugarColumn(ColumnName = "room_name")] + /// public string RoomName { get; set; } /// /// 会议号 - /// - [SugarColumn(ColumnName = "room_num")] + /// public string RoomNum { get; set; } + + /// + /// 届 + /// + public int Year { get; set; } + /// + /// 科目 + /// + public SubjectType Subject { get; set; } + } + + + public class RoomInfoInputDTO + { + public string Id { get; set; } + /// + /// 届 + /// + public int Year { get; set; } + /// + /// 科目 + /// + public SubjectType Subject { get; set; } } } diff --git a/WGShare.Domain/DTOs/Room/RoomOutputDTO.cs b/WGShare.Domain/DTOs/Room/RoomOutputDTO.cs index e86fb47..7db053d 100644 --- a/WGShare.Domain/DTOs/Room/RoomOutputDTO.cs +++ b/WGShare.Domain/DTOs/Room/RoomOutputDTO.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using WGShare.Domain.Enums; using Yitter.IdGenerator; namespace WGShare.Domain.DTOs.Room @@ -24,5 +25,14 @@ namespace WGShare.Domain.DTOs.Room /// 在线人数 /// public long OnlineUserCount { get; set; } - } + + /// + /// 届 + /// + public int Year { get; set; } + /// + /// 科目 + /// + public SubjectType Subject { get; set; } + } }