From 70cb4ca524ee4ecc32f62979d03b5bfde924e321 Mon Sep 17 00:00:00 2001
From: youngq <yq5537@outlook.com>
Date: Thu, 10 Oct 2024 17:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E5=AE=A4=E5=B1=8A=E5=92=8C=E5=B9=B4=E4=BB=BD=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Frontend/HomeController.cs    | 17 ++++++++--
 WGShare.API/WGShare.API.xml                   |  7 ++++
 WGShare.Domain/DTOs/Room/RoomInputDTO.cs      | 34 +++++++++++++++----
 WGShare.Domain/DTOs/Room/RoomOutputDTO.cs     | 12 ++++++-
 4 files changed, 61 insertions(+), 9 deletions(-)

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