Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Common/Enum/User/SpecialtyEnum.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 教师擅长枚举
+    /// </summary>
+    public enum SpecialtyEnum
+    {
+        /// <summary>
+        /// 少儿类：主要以丰富可与时间和兴趣为主，要求课堂轻松活跃。趣味性十足
+        /// </summary>
+        [EnumField("少儿类")]
+        Children = 1,
+
+        /// <summary>
+        /// 兴趣类：成年人，对日语学习从兴趣开始，要求课堂丰富有趣
+        /// </summary>
+        [EnumField("兴趣类")]
+        Interest = 2,
+
+        /// <summary>
+        /// 实用类：对于日语学习有一定的需求（考研、就业等），要求学习过程专业，干货多
+        /// </summary>
+        [EnumField("实用类")]
+        Practical = 3,
+
+        /// <summary>
+        /// 留学类：打算去往日本留学（本科、硕士、语言学校、私塾等）
+        /// </summary>
+        [EnumField("留学类")]
+        StudyAbroad = 4
+    }
+}

Edu.Model/ViewModel/User/RB_Teacher_ViewModel.cs

 using Edu.Common;
 using Edu.Common.Plugin;
 using System;
+using System.Collections.Generic;
 
 namespace Edu.Model.ViewModel.User
 {
@@ -114,5 +115,16 @@ namespace Edu.Model.ViewModel.User
         /// 密码
         /// </summary>
         public string Password { get; set; }
+
+        /// <summary>
+        /// 老师特长
+        /// </summary>
+        public List<int> ChooseSpecialty
+        {
+            get
+            {
+                return Common.ConvertHelper.StringToList(this.Specialty);
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -108,10 +108,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.TeacherId), query.TeacherId);
                 }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
-                }
+                //if (query.School_Id > 0)
+                //{
+                //    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
+                //}
                 if (query.ClassTimeId > 0)
                 {
                     builder.AppendFormat(" AND time.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassTimeId), query.ClassTimeId);

Edu.Repository/Course/RB_Class_TimeRepository.cs

@@ -51,10 +51,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
-                }
+                //if (query.School_Id > 0)
+                //{
+                //    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
+                //}
             }
             return Get<RB_Class_Time_ViewModel>(builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/User/UserController.cs

@@ -324,6 +324,17 @@ namespace Edu.WebApi.Controllers.User
 
         #region 讲师管理
 
+        /// <summary>
+        /// 获取教师擅长列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetTeacherSpecialty()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(SpecialtyEnum));
+            return ApiResult.Success(data: list);
+        }
+
+
         /// <summary>
         /// 获取讲师分页列表
         /// </summary>
@@ -401,7 +412,7 @@ namespace Edu.WebApi.Controllers.User
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
             extModel.Group_Id = base.UserInfo.Group_Id;
-            bool flag = teacherModule.SetTeacherModule_V2(extModel, isUpdateBasic: true);
+            bool flag = teacherModule.SetTeacherModule_V2(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }