页面修改

Edu.Model/Entity/User/RB_Teacher.cs

@@ -187,5 +187,10 @@ namespace Edu.Model.Entity.User
         /// 国籍图片
         /// </summary>
         public string ForeignersUrl { get; set; }
+
+        /// <summary>
+        /// 老师特长
+        /// </summary>
+        public string Specialty { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -2172,8 +2172,10 @@ namespace Edu.Module.Course
         /// <summary>
         /// 上课计划统计
         /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <param name="ClassType">课程类型(0-全部,1-正常,2-试听课)</param>
         /// <returns></returns>
-        public object GetClassPlanStatisticalModule(RB_Class_Plan_ViewModel query)
+        public object GetClassPlanStatisticalModule(RB_Class_Plan_ViewModel query,int ClassType=0)
         {
             List<object> mondayList = new List<object>();
             List<object> tuesdayList = new List<object>();
@@ -2186,15 +2188,33 @@ namespace Edu.Module.Course
             var endTime = Convert.ToDateTime(Common.ConvertHelper.GetWeekSunday(query.EndTime));
             TimeSpan sp = endTime.Subtract(startTime);
             var days = sp.Days + 1;
-            var list = class_PlanRepository.GetClassPlanStatisticalRepository(query);
-            //约课列表
-            var reserveList = reserve_ClassRepository.GetReserveClassListRepository(new Model.ViewModel.Reserve.RB_Reserve_Class_Extend()
+
+            //正常上课计划列表
+            var list = new List<RB_Class_Plan_ViewModel>();
+            //试听课列表
+            var reserveList = new List<RB_Reserve_Class_Extend>();
+
+            var reserveQuery = new RB_Reserve_Class_Extend()
             {
                 StartClassDate = query.StartTime,
                 EndClassDate = query.EndTime,
                 TeacherId = query.TeacherId,
                 ClassRoomId = query.ClassRoomId
-            });
+            };
+            if (ClassType == 0)
+            {
+                list = class_PlanRepository.GetClassPlanStatisticalRepository(query);
+                reserveList = reserve_ClassRepository.GetReserveClassListRepository(reserveQuery);
+            }
+            else if (ClassType == 1)
+            {
+                list = class_PlanRepository.GetClassPlanStatisticalRepository(query);
+            }
+            else if (ClassType == 2)
+            {
+                reserveList = reserve_ClassRepository.GetReserveClassListRepository(reserveQuery);
+            }
+  
             if (list != null || reserveList!=null)
             {
                 var timeList = new List<RB_Class_Time_ViewModel>();
@@ -2215,8 +2235,7 @@ namespace Edu.Module.Course
                         Q_ReserveClassIds = reserveClassIds
                     });
                 }
-               
-              
+
                 for (var i = 0; i < days; i++)
                 {
                     var ClassDate = startTime.AddDays(i);

Edu.Module.Duty/VisitorReserveModule.cs

@@ -212,17 +212,21 @@ namespace Edu.Module.Duty
             message = "";
             var chooseDateTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(model.ClassDate) + " " + model.ClassTime);
             var chooseEndTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(model.ClassDate) + " " + model.EndTime);
-            var isExists = CheckClassModule(model.TeacherId, model.Group_Id, model.ClassDate, chooseDateTime, chooseEndTime, out string newMsg);
-            if (!isExists)
+            #region 教师验证
+            if (CheckClassTeacherModule(chooseDateTime, chooseEndTime, model, out string newMsg))
             {
                 message = newMsg;
                 return false;
             }
-            if (CheckReserveClassExistsModule(model))
+            #endregion
+
+            #region 验证教室
+            if (CheckClassRoomModule( chooseDateTime, chooseEndTime, model,out string roomMessage))
             {
-                message = string.Format("此教师已有{0}的试听课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                message = roomMessage;
                 return false;
             }
+            #endregion
             if (model.ReserveClassId > 0)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -248,32 +252,69 @@ namespace Edu.Module.Duty
         }
 
         /// <summary>
-        /// 检查预约课程是否存在
+        /// 检查老师是否有上课安排
         /// </summary>
+        /// <param name="chooseDateTime"></param>
+        /// <param name="chooseEndTime"></param>
         /// <param name="model"></param>
+        /// <param name="message"></param>
         /// <returns></returns>
-        public bool CheckReserveClassExistsModule(RB_Reserve_Class_Extend model)
+        public bool CheckClassTeacherModule(DateTime chooseDateTime, DateTime chooseEndTime, RB_Reserve_Class_Extend model, out string message)
         {
-            return reserve_ClassRepository.ExistsReserveClassRepository(model);
+            message = "";
+            var planList = class_PlanRepository.GetClassPlanListExtRepository(new Model.ViewModel.Course.RB_Class_Plan_ViewModel()
+            {
+                TeacherId = model.TeacherId,
+                QClassDateStr = Common.ConvertHelper.FormatDate(model.ClassDate),
+                Group_Id = model.Group_Id
+            });
+            if (planList != null && planList.Count > 0)
+            {
+                foreach (var item in planList)
+                {
+                    var startTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ClassDate) + " " + item.StartTime);
+                    var endTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ClassDate) + " " + item.EndTime);
+                    if (chooseDateTime < endTime && chooseEndTime > startTime)
+                    {
+                        message = string.Format("此教师已有{0}的正常上课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                        return true;
+                    }
+                }
+            }
+
+            var checkModel = new RB_Reserve_Class_Extend()
+            {
+                ClassDate = model.ClassDate,
+                ClassTime = model.ClassTime,
+                EndTime = model.EndTime,
+                ReserveClassId = model.ReserveClassId,
+                TeacherId = model.TeacherId
+            };
+            if (CheckReserveClassExistsModule(checkModel))
+            {
+                message = string.Format("此教师已有{0}的试听课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                return true;
+            }
+            return false;
         }
 
+
         /// <summary>
-        /// 检查老师是否有上课安排
+        /// 检查教室是否重复
         /// </summary>
-        /// <param name="TeacherId"></param>
-        /// <param name="Group_Id"></param>
-        /// <param name="ClassDate"></param>
         /// <param name="chooseDateTime"></param>
-        /// <param name="message"></param>
+        /// <param name="chooseEndTime"></param>
+        /// <param name="model"></param>
+        /// <param name="RoomMessage"></param>
         /// <returns></returns>
-        public bool CheckClassModule(int TeacherId,int Group_Id,DateTime ClassDate,DateTime chooseDateTime,DateTime chooseEndTime, out string message)
+        public bool CheckClassRoomModule(DateTime chooseDateTime, DateTime chooseEndTime, RB_Reserve_Class_Extend model,out string RoomMessage)
         {
-            message = "";
+            RoomMessage = "";
             var planList = class_PlanRepository.GetClassPlanListExtRepository(new Model.ViewModel.Course.RB_Class_Plan_ViewModel()
             {
-                TeacherId = TeacherId,
-                QClassDateStr = Common.ConvertHelper.FormatDate(ClassDate),
-                Group_Id = Group_Id
+                ClassRoomId=model.ClassRoomId,
+                QClassDateStr = Common.ConvertHelper.FormatDate(model.ClassDate),
+                Group_Id = model.Group_Id
             });
             if (planList != null && planList.Count > 0)
             {
@@ -281,16 +322,40 @@ namespace Edu.Module.Duty
                 {
                     var startTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ClassDate) + " " + item.StartTime);
                     var endTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ClassDate) + " " + item.EndTime);
-                    if (chooseDateTime<endTime&& chooseEndTime>startTime)
+                    if (chooseDateTime < endTime && chooseEndTime > startTime)
                     {
-                        message =string.Format( "此教师已有{0}的上课计划!请重新选择时间",Common.ConvertHelper.FormatDate(chooseDateTime));
-                        return false;
+                        RoomMessage = string.Format("此教室已有{0}的正常上课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                        return true;
                     }
                 }
             }
-            return true;
+            var checkModel = new RB_Reserve_Class_Extend()
+            {
+                ClassDate = model.ClassDate,
+                ClassTime = model.ClassTime,
+                EndTime = model.EndTime,
+                ReserveClassId = model.ReserveClassId,
+                ClassRoomId = model.ClassRoomId
+            };
+            if (CheckReserveClassExistsModule(checkModel))
+            {
+                RoomMessage = string.Format("此教室已有{0}的试听课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 检查预约课程是否存在
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool CheckReserveClassExistsModule(RB_Reserve_Class_Extend model)
+        {
+            return reserve_ClassRepository.ExistsReserveClassRepository(model);
         }
 
+    
         /// <summary>
         /// 根据编号获取约课班级
         /// </summary>

Edu.Module.User/TeacherModule.cs

@@ -295,6 +295,7 @@ namespace Edu.Module.User
                 fileds.Add(nameof(RB_Teacher_ViewModel.Post_Id), model.Post_Id);
                 fileds.Add(nameof(RB_Teacher_ViewModel.BaseStuNum), model.BaseStuNum);
                 fileds.Add(nameof(RB_Teacher_ViewModel.BaseHourFee), model.BaseHourFee);
+                fileds.Add(nameof(RB_Teacher_ViewModel.Specialty), model.Specialty);
                 #region 修改日志
                 string logContent = "";
                 if (model.TeacherName != oldModel.TeacherName)
@@ -338,6 +339,10 @@ namespace Edu.Module.User
                 {
                     logContent += string.Format(",将基础带班人数由【{0}】修改为【{1}】。", oldModel.BaseStuNum, model.BaseStuNum);
                 }
+                if (model.Specialty != oldModel.Specialty)
+                {
+                    logContent += string.Format(",将特长由【{0}】修改为【{1}】。", oldModel.Specialty, model.Specialty);
+                }
                 if (!string.IsNullOrEmpty(logContent))
                 {
                     //新增日志

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -92,6 +92,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
                 }
+                if (query.ClassRoomId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassRoomId), query.ClassRoomId);
+                }
                 if (query.ClassPlanId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassPlanId), query.ClassPlanId);

Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs

@@ -123,6 +123,10 @@ WHERE 1=1 AND c.Status=0 AND NOT(CONCAT(substring(C.ClassDate,1,10),' ',C.ClassT
             {
                 builder.AppendFormat(" AND C.TeacherId={0} ", query.TeacherId);
             }
+            if (query.ClassRoomId > 0)
+            {
+                builder.AppendFormat(" AND C.ClassRoomId={0} ", query.ClassRoomId);
+            }
             if (query.ReserveClassId > 0)
             {
                 builder.AppendFormat(" AND C.ReserveClassId<>{0} ", query.ReserveClassId);

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1951,7 +1951,9 @@ namespace Edu.WebApi.Controllers.Course
                 Group_Id = base.UserInfo.Group_Id,
                 ClassId = base.ParmJObj.GetInt("ClassId"),
             };
-            var obj = classModule.GetClassPlanStatisticalModule(query);
+            //课程类型(0-全部,1-正常,2-试听课)
+            int ClassType = base.ParmJObj.GetInt("ClassType");
+            var obj = classModule.GetClassPlanStatisticalModule(query,ClassType: ClassType);
             return ApiResult.Success(data: obj);
         }
 

Edu.WebApi/Controllers/User/UserController.cs

@@ -392,7 +392,8 @@ namespace Edu.WebApi.Controllers.User
                 Post_Id = base.ParmJObj.GetInt("Post_Id"),
                 BaseStuNum = base.ParmJObj.GetInt("BaseStuNum"),
                 BaseHourFee = base.ParmJObj.GetDecimal("BaseHourFee"),
-                AuditStatus = AccountStatusEnum.Pass
+                AuditStatus = AccountStatusEnum.Pass,
+                Specialty=base.ParmJObj.GetStringValue("Specialty"),
             };
             extModel.TeachTag = base.ParmJObj.GetStringValue("TeachTag");
             extModel.CreateBy = base.UserInfo.Id;