提交代码

Edu.Model/ViewModel/Course/RB_Class_Room_ViewModel.cs

@@ -7,6 +7,9 @@ namespace Edu.Model.ViewModel.Course
     /// </summary>
     public class RB_Class_Room_ViewModel : RB_Class_Room
     {
+        public string CreateByName { get; set; }
 
+
+        public string UpdateByName { get; set; }
     }
 }

Edu.Module.Course/ClassRoomModule.cs

-using Edu.Model.ViewModel.Course;
+using Edu.Common.Enum;
+using Edu.Model.ViewModel.Course;
 using Edu.Repository.Course;
 using System;
 using System.Collections.Generic;
@@ -8,12 +9,12 @@ using VT.FW.DB;
 namespace Edu.Module.Course
 {
     /// <summary>
-    /// 教师管理处理类
+    /// 教室管理处理类
     /// </summary>
     public class ClassRoomModule
     {
         /// <summary>
-        /// 教师管理仓储层对象
+        /// 教室管理仓储层对象
         /// </summary>
         private readonly RB_Class_RoomRepository class_RoomRepository = new RB_Class_RoomRepository();
 
@@ -53,6 +54,8 @@ namespace Edu.Module.Course
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Class_Room_ViewModel.RoomName),extModel.RoomName },
+                     {nameof(RB_Class_Room_ViewModel.UpdateBy),extModel.UpdateBy },
+                      {nameof(RB_Class_Room_ViewModel.UpdateTime),extModel.UpdateTime },
                 };
                 flag = class_RoomRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Room_ViewModel.RoomId), extModel.RoomId));
             }
@@ -64,5 +67,30 @@ namespace Edu.Module.Course
             }
             return flag;
         }
+
+
+        /// <summary>
+        /// 根据班级编号获取教室详细信息
+        /// </summary>
+        /// <param name="RoomId"></param>
+        /// <returns></returns>
+        public RB_Class_Room_ViewModel GetClassRoomModule(object RoomId)
+        {
+            return class_RoomRepository.GetEntity<RB_Class_Room_ViewModel>(RoomId);
+        }
+
+        /// <summary>
+        /// 删除教室
+        /// </summary>
+        /// <param name="RoomId"></param>
+        /// <returns></returns>
+        public bool RemoveClassRoomModule(object RoomId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_Class_Room_ViewModel.Status),(int)DateStateEnum.Delete},
+            };
+            return class_RoomRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Room_ViewModel.RoomId), RoomId));
+        }
     }
 }

Edu.Repository/User/RB_AccountRepository.cs

@@ -270,14 +270,21 @@ FROM
                 {
                     where.AppendFormat(" AND b.{0}<='{1} 23:59:59' ", nameof(Employee_ViewModel.LeaveTime), query.EndLeaveTime);
                 }
-
-                if (!string.IsNullOrEmpty(query.StartBirthDate) && !string.IsNullOrEmpty(query.EndBirthDate))
+                if (!string.IsNullOrEmpty(query.StartBirthDate))
+                {
+                    where.AppendFormat($@"AND STR_TO_DATE(CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')), '%Y-%m-%d') >= STR_TO_DATE(CONCAT(DATE_FORMAT(now(),'%Y'),'-','{query.StartBirthDate}') , '%Y-%m-%d') ");
+                }
+                if (!string.IsNullOrEmpty(query.EndBirthDate))
                 {
-                    where.AppendFormat(@"AND (    
-                                                     CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')) >= '{0}' 
-                                                 AND CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')) <= '{1}'
-                                                )", query.StartBirthDate, query.EndBirthDate);
+                    where.AppendFormat($@" AND (CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')), '%Y-%m-%d') <= STR_TO_DATE(CONCAT(DATE_FORMAT(now(),'%Y'),'-','{query.EndBirthDate}') , '%Y-%m-%d') ");
                 }
+                //if (!string.IsNullOrEmpty(query.StartBirthDate) && !string.IsNullOrEmpty(query.EndBirthDate))
+                //{
+                //    where.AppendFormat(@"AND (    
+                //                                     CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')) >= '{0}' 
+                //                                 AND CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')) <= '{1}'
+                //                                )", query.StartBirthDate, query.EndBirthDate);
+                //}
             }
 
             StringBuilder builder = new StringBuilder();

Edu.WebApi/Controllers/Course/ClassRoomController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Edu.Cache.User;
+using Edu.Common.API;
+using Edu.Common.Plugin;
+using Edu.Model.ViewModel.Course;
+using Edu.Module.Course;
+using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Edu.WebApi.Controllers.Course
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class ClassRoomController : BaseController
+    {
+        /// <summary>
+        /// 教室处理类对象
+        /// </summary>
+        private readonly ClassRoomModule classRoomModule = new ClassRoomModule();
+
+        #region 教室管理
+        /// <summary>
+        /// 获取教室页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassRoomPageList()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Room_ViewModel>(RequestParm.Msg.ToString());
+            query.Group_Id = base.UserInfo.Group_Id;
+            query.School_Id = base.UserInfo.School_Id;
+            var list = classRoomModule.GetClassRoomPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+                if (item.UpdateBy > 0)
+                {
+                    item.UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? "";
+                }
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 获取教室列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassRoomList()
+        {
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Room_ViewModel>(RequestParm.Msg.ToString());
+            query.Group_Id = base.UserInfo.Group_Id;
+            query.School_Id = base.UserInfo.School_Id;
+            var list = classRoomModule.GetClassRoomListRepository(query);
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 添加修改教室
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetClassRoom()
+        {
+            var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Room_ViewModel>(RequestParm.Msg.ToString());
+            extModel.CreateTime = DateTime.Now;
+            extModel.CreateBy = UserInfo.Id;
+            extModel.UpdateBy = UserInfo.Id;
+            extModel.UpdateTime = DateTime.Now;
+            extModel.Group_Id = this.UserInfo.Group_Id;
+            extModel.School_Id = this.UserInfo.School_Id;
+            bool flag = classRoomModule.SetClassRoomModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取教室实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassRoom()
+        {
+            var ClassId = base.ParmJObj.GetInt("RoomId", 0);
+            var extModel = classRoomModule.GetClassRoomModule(ClassId);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 删除教室
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveClassRoom()
+        {
+            var ClassId = base.ParmJObj.GetInt("RoomId", 0);
+            var flag = classRoomModule.RemoveClassRoomModule(ClassId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion
+    }
+}

Edu.WebApi/Controllers/User/UserController.cs

@@ -645,6 +645,9 @@ namespace Edu.WebApi.Controllers.User
                 qitem.AccountType,
                 qitem.IsBirth,
                 qitem.AccountId,
+                qitem.School_Id,
+                qitem.Group_Id,
+                qitem.Dept_Id,
             });
             return ApiResult.Success(data: pageModel);
         }