新增修改会议室届和年份接口

WGShare.API/Controllers/Frontend/HomeController.cs

@@ -63,8 +63,8 @@ namespace WGShare.API.Controllers.Frontend
 
             var list = await _sqlSugar.Queryable<Room>()
                 .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;
         }
 
+        /// <summary>
+        /// 更新会议室信息
+        /// </summary>
+        /// <param name="inputDTO"></param>
+        /// <returns></returns>
+        [HttpPut("room-info")]
+        public async Task<bool> ModifyRoom([FromBody] RoomInfoInputDTO inputDTO)
+        {
+            var entity = inputDTO.Adapt<Room>();
+            return await _sqlSugar.Updateable(entity)
+               .UpdateColumns(x => new { x.Year, x.Subject })
+               .ExecuteCommandHasChangeAsync();
+        }
 
         /// <summary>
         /// 删除会议室

WGShare.API/WGShare.API.xml

@@ -102,6 +102,13 @@
             <param name="inputDTO"></param>   
             <returns></returns>
         </member>
+        <member name="M:WGShare.API.Controllers.Frontend.HomeController.ModifyRoom(WGShare.Domain.DTOs.Room.RoomInfoInputDTO)">
+            <summary>
+            更新会议室信息
+            </summary>
+            <param name="inputDTO"></param>
+            <returns></returns>
+        </member>
         <member name="M:WGShare.API.Controllers.Frontend.HomeController.DeleteRoom(System.String)">
             <summary>
             删除会议室

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
+    {
         /// <summary>
         /// 会议室名称 
-        ///</summary>
-        [SugarColumn(ColumnName = "room_name")]
+        ///</summary> 
         public string RoomName { get; set; }
         /// <summary>
         /// 会议号 
-        ///</summary>
-        [SugarColumn(ColumnName = "room_num")]
+        ///</summary> 
         public string RoomNum { get; set; }
+
+        /// <summary>
+        /// 届 
+        ///</summary> 
+        public int Year { get; set; }
+        /// <summary>
+        /// 科目
+        ///</summary> 
+        public SubjectType Subject { get; set; }
+    }
+
+
+    public class RoomInfoInputDTO
+    {
+        public string Id { get; set; }
+        /// <summary>
+        /// 届 
+        ///</summary> 
+        public int Year { get; set; }
+        /// <summary>
+        /// 科目
+        ///</summary> 
+        public SubjectType Subject { get; set; }
     }
 }

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
         /// 在线人数
         /// </summary>
         public long OnlineUserCount { get; set; }
-    }
+
+        /// <summary>
+        /// 届 
+        ///</summary> 
+        public int Year { get; set; }
+        /// <summary>
+        /// 科目
+        ///</summary> 
+        public SubjectType Subject { get; set; }
+    } 
 }