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

Edu.Model/ViewModel/Course/TeacherClassStatic_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 教师班级统计
+    /// </summary>
+    public class TeacherClassStatic_ViewModel
+    {
+        /// <summary>
+        /// 教师编号
+        /// </summary>
+        public int Teacher_Id { get; set; }
+
+        /// <summary>
+        /// 带班数量
+        /// </summary>
+        public int ClassCount { get; set; }
+    }
+}

Edu.Module.System/MenuModule.cs

@@ -175,7 +175,7 @@ namespace Edu.Module.System
             if (list != null && list.Count > 0)
             {
                 //一级菜单
-                var firstLevelList = list.Where(qitem => qitem.MenuLevel == 1).ToList();
+                var firstLevelList = list.Where(qitem => qitem.MenuLevel == 1).OrderBy(qitem=>qitem.SortNum).ToList();
                 if (firstLevelList != null && firstLevelList.Count > 0)
                 {
                     foreach (var fItem in firstLevelList)

Edu.Module.User/AssistModule.cs

@@ -197,15 +197,34 @@ namespace Edu.Module.User
             {
                 var newId = assistRepository.Insert(model);
                 model.AId = newId;
-                userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建用户", newId, AccountTypeEnum.Assist);
+                userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建助教用户", newId, AccountTypeEnum.Assist);
                 flag = newId > 0;
+
+                var accountList = accountModule.GetAccountListExtModule(new RB_Account_ViewModel()
+                {
+                    Account = model.AssistTel,
+                    AccountType = AccountTypeEnum.Assist
+                });
+                if (accountList == null || (accountList != null && accountList.Count == 0))
+                {
+                    flag = accountModule.SetAccountModule(new RB_Account_ViewModel()
+                    {
+                        Account = model.AssistTel,
+                        Password = Common.DES.Encrypt(Common.Config.DefaultPwd),
+                        AccountType = AccountTypeEnum.Assist,
+                        AccountId = model.AId,
+                        CreateBy = model.CreateBy,
+                        UpdateBy = model.CreateBy,
+                        CreateTime = DateTime.Now,
+                        UpdateTime = DateTime.Now,
+                        Group_Id = model.Group_Id,
+                        School_Id = model.School_Id,
+                    });
+                }
             }
             return flag;
         }
 
-
-
-
         /// <summary>
         /// 添加修改助教部门
         /// </summary>

Edu.Module.User/TeacherModule.cs

@@ -4,8 +4,10 @@ using Edu.Common.Enum;
 using Edu.Common.Enum.User;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
+using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.User;
 using Edu.Module.Log;
+using Edu.Repository.Course;
 using Edu.Repository.User;
 using System;
 using System.Collections.Generic;
@@ -44,6 +46,11 @@ namespace Edu.Module.User
         /// </summary>
         private readonly UserChangeLogModule userChangeLogModule = new UserChangeLogModule();
 
+        /// <summary>
+        /// 班级仓储层对象
+        /// </summary>
+        private readonly RB_ClassRepository classRepository = new RB_ClassRepository();
+
         /// <summary>
         /// 获取讲师列表
         /// </summary>
@@ -70,8 +77,10 @@ namespace Edu.Module.User
             {
                 string postIds = string.Join(",", list.Where(qitem => qitem.Post_Id > 0).Select(qitem => qitem.Post_Id));
                 string deptIds = string.Join(",", list.Where(qitem => qitem.Dept_Id > 0).Select(qitem => qitem.Dept_Id));
+                string ids = string.Join(",", list.Where(qitem => qitem.TId > 0).Select(qitem => qitem.TId));
                 List<RB_Post_ViewModel> postList = new List<RB_Post_ViewModel>();
                 List<RB_Department_ViewModel> deptList = new List<RB_Department_ViewModel>();
+                List<TeacherClassStatic_ViewModel> teacherClassList = new List<TeacherClassStatic_ViewModel>();
                 if (!string.IsNullOrEmpty(postIds))
                 {
                     postList = postRepository.GetPostListRepository(new RB_Post_ViewModel() { QPostIds = postIds });
@@ -80,10 +89,15 @@ namespace Edu.Module.User
                 {
                     deptList = departmentRepository.GetDepartmentListRepository(new RB_Department_ViewModel() { QDeptIds = deptIds });
                 }
+                if (!string.IsNullOrEmpty(ids))
+                {
+                    teacherClassList=classRepository.GetTeacherClassCountRepository(ids);
+                }
                 foreach (var item in list)
                 {
                     item.DeptName = deptList?.Where(qitem => qitem.DeptId == item.Dept_Id)?.FirstOrDefault()?.DeptName ?? "";
                     item.PostName = postList?.Where(qitem => qitem.PostId == item.Post_Id)?.FirstOrDefault()?.PostName ?? "";
+                    item.CourseCount = teacherClassList?.Where(qitem => qitem.Teacher_Id == item.TId)?.FirstOrDefault()?.ClassCount ?? 0;
                 }
             }
             return list;
@@ -208,8 +222,32 @@ namespace Edu.Module.User
             {
                 var newId = teacherRepository.Insert(model);
                 model.TId = newId;
-                userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建用户", newId, AccountTypeEnum.Teacher);
+                userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建教师用户", newId, AccountTypeEnum.Teacher);
                 flag = newId > 0;
+                if (model.AuditStatus == AccountStatusEnum.Pass && flag)
+                {
+                    var accountList = accountModule.GetAccountListExtModule(new RB_Account_ViewModel()
+                    {
+                        Account = model.TeacherTel,
+                        AccountType = AccountTypeEnum.Teacher
+                    });
+                    if (accountList == null || (accountList != null && accountList.Count == 0))
+                    {
+                        flag = accountModule.SetAccountModule(new RB_Account_ViewModel()
+                        {
+                            Account = model.TeacherTel,
+                            Password = Common.DES.Encrypt(Common.Config.DefaultPwd),
+                            AccountType = AccountTypeEnum.Teacher,
+                            AccountId = model.TId,
+                            CreateBy = model.CreateBy,
+                            UpdateBy = model.CreateBy,
+                            CreateTime = DateTime.Now,
+                            UpdateTime = DateTime.Now,
+                            Group_Id = model.Group_Id,
+                            School_Id = model.School_Id,
+                        });
+                    }
+                }
             }
             return flag;
         }

Edu.Repository/Course/RB_ClassRepository.cs

 using Edu.Common.Enum;
 using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.User;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -123,6 +124,7 @@ SELECT A.*,B.CourseName,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead
         /// <returns></returns>
         public List<RB_Class_ViewModel> GetClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Class_ViewModel query)
         {
+            
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
@@ -159,17 +161,17 @@ WHERE 1=1
                 }
                 if (!string.IsNullOrWhiteSpace(query.CourseName))
                 {
-                    builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Class_ViewModel.CourseName));
+                    builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Course_ViewModel.CourseName));
                     parameters.Add("CourseName", "%" + query.CourseName.Trim() + "%");
                 }
                 if (!string.IsNullOrWhiteSpace(query.AssistName))
                 {
-                    builder.AppendFormat(" AND C.{0} LIKE @AssistName ", nameof(RB_Class_ViewModel.AssistName));
+                    builder.AppendFormat(" AND C.{0} LIKE @AssistName ", nameof(RB_Assist_ViewModel.AssistName));
                     parameters.Add("AssistName", "%" + query.AssistName.Trim() + "%");
                 }
                 if (!string.IsNullOrWhiteSpace(query.TeacherName))
                 {
-                    builder.AppendFormat(" AND D.{0} LIKE @TeacherName ", nameof(RB_Class_ViewModel.TeacherName));
+                    builder.AppendFormat(" AND D.{0} LIKE @TeacherName ", nameof(RB_Teacher_ViewModel.TeacherName));
                     parameters.Add("TeacherName", "%" + query.TeacherName.Trim() + "%");
                 }
             }
@@ -312,5 +314,22 @@ WHERE c.`Status`=0 and c.Group_Id ={GroupId} and c.ClassStatus =3 and c.EndClass
 
             return Get<RB_Class_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 统计教师带班数量
+        /// </summary>
+        /// <param name="teacherIds"></param>
+        /// <returns></returns>
+        public List<TeacherClassStatic_ViewModel> GetTeacherClassCountRepository(string teacherIds)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT Teacher_Id,COUNT(1) AS ClassCount 
+FROM rb_class 
+WHERE status=0 AND ClassStatus<>4 AND Teacher_Id IN({0})
+GROUP BY Teacher_Id
+",teacherIds);
+            return Get<TeacherClassStatic_ViewModel>(builder.ToString()).ToList();
+        }
     }
 }

Edu.Repository/Course/RB_CourseRepository.cs

@@ -68,7 +68,7 @@ WHERE 1=1
             {
                 if ((int)query.Status > -1)
                 {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_ViewModel.Status), query.Status);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_ViewModel.Status), (int)query.Status);
                 }
                 if (!string.IsNullOrWhiteSpace(query.CourseName))
                 {

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -39,7 +39,9 @@ namespace Edu.WebApi.Controllers.Course
                 ClassStatus = (ClassStatusEnum)base.ParmJObj.GetInt("ClassStatus"),
                 Teacher_Id = base.ParmJObj.GetInt("Teacher_Id"),
                 CouseId = base.ParmJObj.GetInt("CouseId"),
-                School_Id = base.ParmJObj.GetInt("School_Id")
+                School_Id = base.ParmJObj.GetInt("School_Id"),
+                TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
+                CourseName=base.ParmJObj.GetStringValue("CourseName"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -813,7 +813,22 @@ namespace Edu.WebApi.Controllers.Course
         {
             var userInfo = base.UserInfo;
             ResultPageModel pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            RB_Order_ViewModel demodel = JsonHelper.DeserializeObject<RB_Order_ViewModel>(RequestParm.Msg.ToString());
+            RB_Order_ViewModel demodel = new RB_Order_ViewModel()
+            {
+                OrderId = base.ParmJObj.GetInt("OrderId"),
+                GuestName = base.ParmJObj.GetStringValue("GuestName"),
+                ClassName = base.ParmJObj.GetStringValue("ClassName"),
+                CouseId = base.ParmJObj.GetInt("CouseId"),
+                StartTime = base.ParmJObj.GetStringValue("StartTime"),
+                EndTime = base.ParmJObj.GetStringValue("EndTime"),
+                OPStartTime = base.ParmJObj.GetStringValue("OPStartTime"),
+                OPEndTime = base.ParmJObj.GetStringValue("OPEndTime"),
+                Q_NotCollect = base.ParmJObj.GetInt("Q_NotCollect"),
+                OrderState = (OrderStateEnum)base.ParmJObj.GetInt("OrderState"),
+                Q_OrderState = base.ParmJObj.GetInt("Q_OrderState"),
+                Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
+                PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
+            };
             demodel.Group_Id = userInfo.Group_Id;
             demodel.EnterID = userInfo.Id;
 

Edu.WebApi/Controllers/Course/StuController.cs

-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Edu.Cache.User;
 using Edu.Common.API;
 using Edu.Common.Enum.Course;
@@ -167,5 +168,31 @@ namespace Edu.WebApi.Controllers.Course
             string msg = studentBillModule.SetStudentBackFinance(BackClassId, IsPublic, CurrencyId, ClientType, ClientId, userInfo);
             return string.IsNullOrEmpty(msg) ? ApiResult.Success() : ApiResult.Failed(msg);
         }
+
+        /// <summary>
+        /// 学员续费订单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RenewOrder()
+        {
+            //订单编号
+            int OrderId = base.ParmJObj.GetInt("OrderId");
+            //学员编号
+            int guestId = base.ParmJObj.GetInt("GuestId");
+            var orderModel = new RB_Order_ViewModel()
+            {
+
+                SaleRemark="学员续费",
+                CreateBy=base.UserInfo.Id,
+                CreateTime=DateTime.Now,
+                UpdateBy=base.UserInfo.Id,
+                UpdateTime=DateTime.Now,
+                Dept_Id=base.UserInfo.DeptId,
+                Group_Id=base.UserInfo.Group_Id,
+            };
+            bool flag = studentBillModule.RenewOrderModule(OrderId, guestId, orderModel,out string message);
+            return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
+        }
     }
 }

Edu.WebApi/Controllers/User/LoginController.cs

@@ -41,7 +41,15 @@ namespace Edu.WebApi.Controllers.User
         /// 公用处理类
         /// </summary>
         private readonly PublicModule publicModule = new PublicModule();
-             
+
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult Test()
+        {
+            return ApiResult.Success();
+        }
+
         /// <summary>
         /// 用户登录
         /// </summary>

Edu.WebApi/Controllers/User/UserController.cs

@@ -356,13 +356,13 @@ 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
             };
             extModel.TeachTag = base.ParmJObj.GetStringValue("TeachTag");
             extModel.CreateBy = base.UserInfo.Id;
             extModel.CreateTime = DateTime.Now;
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
-            extModel.AuditStatus = Common.Enum.User.AccountStatusEnum.Normal;
             extModel.Group_Id = base.UserInfo.Group_Id;
             bool flag = teacherModule.SetTeacherModule(extModel, isUpdateBasic: true);
             return flag ? ApiResult.Success() : ApiResult.Failed();
@@ -478,14 +478,15 @@ namespace Edu.WebApi.Controllers.User
                 AssistIcon = base.ParmJObj.GetStringValue("AssistIcon"),
                 AssistIntro = base.ParmJObj.GetStringValue("AssistIntro"),
                 Dept_Id = base.ParmJObj.GetInt("Dept_Id"),
-                Post_Id = base.ParmJObj.GetInt("Post_Id")
+                Post_Id = base.ParmJObj.GetInt("Post_Id"),
+                AuditStatus= AccountStatusEnum.Pass
             };
             extModel.CreateBy = base.UserInfo.Id;
             extModel.CreateTime = DateTime.Now;
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
             extModel.Group_Id = base.UserInfo.Group_Id;
-            extModel.AuditStatus = Common.Enum.User.AccountStatusEnum.Normal;
+ 
             bool flag = assistModule.SetAssistModule(extModel,isUpdateBasic:true);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
@@ -808,9 +809,6 @@ namespace Edu.WebApi.Controllers.User
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
-
-
-
         /// <summary>
         /// 批量重置用户密码信息
         /// </summary>
@@ -832,7 +830,6 @@ namespace Edu.WebApi.Controllers.User
                 {
                     viewList.ForEach(x => x.Group_Id = UserReidsCache.GetUserLoginInfo(uid).Group_Id);
                     //判断账户信息是否存在，不存在就不去更新密码
-
                     var list = accountModule.GetUpdateAccountListRepository(viewList);
                     if (list != null && list.Any())
                     {

Edu.WebApi/Startup.cs

@@ -50,6 +50,7 @@ namespace Edu.WebApi
                 "http://mall.oytour.com",
                 "http://testmall.oytour.com",
                 "http://yx.oytour.com",
+                "http://edu.oytour.com",
             };
             services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
         }