页面修改

Edu.Common/Enum/Course/GuestLearningGoalsEnum.cs

@@ -40,10 +40,17 @@ namespace Edu.Common.Enum.Course
         /// </summary>
         [EnumField("工作")]
         Work = 6,
+
         /// <summary>
         /// 移民
         /// </summary>
         [EnumField("移民")]
         Immigrant = 7,
+
+        /// <summary>
+        /// 考级
+        /// </summary>
+        [EnumField("考级")]
+        ExamGrade = 8,
     }
 }

Edu.Common/Enum/User/StuChannelEnum.cs

@@ -51,5 +51,11 @@ namespace Edu.Common.Enum.User
         /// </summary>
         [EnumField("其他")]
         Other = 7,
+
+        /// <summary>
+        /// 校园推广
+        /// </summary>
+        [EnumField("校园推广")]
+        SchoolPromote = 8,
     }
 }
\ No newline at end of file

Edu.Repository/User/RB_AccountRepository.cs

@@ -427,6 +427,10 @@ FROM
                     where2.AppendFormat(" AND A.{0} LIKE @EmployeeName ", nameof(Employee_ViewModel.EmployeeName));
                     parameters.Add("EmployeeName", "%" + query.EmployeeName.Trim() + "%");
                 }
+                if (query.UserRole > 0)
+                {
+                    where2.AppendFormat(" AND A.{0}={1} ", nameof(Employee_ViewModel.UserRole),(int)query.UserRole);
+                }
                 if (!string.IsNullOrEmpty(query.AccountTypeStr))
                 {
                     where2.AppendFormat(" AND A.{0} IN({1}) ", nameof(Employee_ViewModel.AccountType), query.AccountTypeStr);

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -1201,6 +1201,7 @@ namespace Edu.WebApi.Controllers.Course
         /// 获取课程优惠价格列表
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult GetCoursePreferentialList()
         {
             var CourseId = base.ParmJObj.GetInt("CourseId", 0);
@@ -1208,6 +1209,16 @@ namespace Edu.WebApi.Controllers.Course
             return ApiResult.Success(data: list.OrderBy(qitem => qitem.PriceDiscountType));
         }
 
+        /// <summary>
+        /// 获取课程优惠价格列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCourseRebateSetList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(CourseRebateSetEnum));
+            return ApiResult.Success(data: list);
+        }
 
         /// <summary>
         /// 批量设置课程优惠价格

Edu.WebApi/Controllers/User/UserController.cs

@@ -718,6 +718,7 @@ namespace Edu.WebApi.Controllers.User
                     item.StuStage,
                     item.StuStageName,
                     CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
+                    item.CreateBy,
                     item.CreateByName,
                     item.CreateType,
                     CreateTypeStr = item.CreateType.ToName(),
@@ -2206,6 +2207,7 @@ namespace Edu.WebApi.Controllers.User
                 EmployeeName = base.ParmJObj.GetStringValue("EmployeeName"),//姓名
                 AccountTypeStr = base.ParmJObj.GetStringValue("AccountTypeStr"),//人员类型【逗号分割】
                 IsLeave = base.ParmJObj.GetInt("IsLeave"),
+                UserRole = (UserRoleEnum)base.ParmJObj.GetInt("UserRole"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             var list = employeeModule.GetEmployeeListModule(query);