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

Edu.Common/Enum/Course/ClassLogTypeEnum.cs

@@ -25,5 +25,11 @@ namespace Edu.Common.Enum.Course
         /// </summary>
         [EnumField("上课记录")]
         Class = 3,
+
+        /// <summary>
+        /// 创建班级
+        /// </summary>
+        [EnumField("创建班级")]
+        CreateClass =4,
     }
 }

Edu.Model/Entity/Course/RB_Class.cs

@@ -151,5 +151,10 @@ namespace Edu.Model.Entity.Course
 		/// 完成进度
 		/// </summary>
 		public int CompleteProgress { get; set; }
+
+		/// <summary>
+		/// 班级类型(1-学生班，2-社会班)
+		/// </summary>
+		public int ClassType { get; set; }
 	}
 }

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -97,6 +97,12 @@ namespace Edu.Model.ViewModel.Course
         /// 查询可报名  1是
         /// </summary>
         public int Q_CanApply { get; set; }
+
+        /// <summary>
+        /// 班级ids
+        /// </summary>
+        public string Q_ClassIds { get; set; }
+
         /// 选中的周几/或日期数组
         /// </summary>
         public List<string> WeekDayList { get; set; }

Edu.Module.Course/ClassModule.cs

@@ -153,8 +153,9 @@ namespace Edu.Module.Course
                     { nameof(RB_Class_ViewModel.ClassStyle),model.ClassStyle},
                     { nameof(RB_Class_ViewModel.ClassStatus),model.ClassStatus},
                     { nameof(RB_Class_ViewModel.InnerRemark),model.InnerRemark},
-                    { nameof(RB_Class_ViewModel.OutRemark),model.OutRemark},
+                    { nameof(RB_Class_ViewModel.ClassType),model.ClassType},
                     //{ nameof(RB_Class_ViewModel.CompleteProgress),model.CompleteProgress},
+                    //{ nameof(RB_Class_ViewModel.OutRemark),model.OutRemark},
                 };
                 flag = classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), model.ClassId));
             }
@@ -163,6 +164,7 @@ namespace Edu.Module.Course
                 var newId = classRepository.Insert(model);
                 model.ClassId = newId;
                 flag = newId > 0;
+                classLogRepository.AddClassLogRepository(Common.Enum.Course.ClassLogTypeEnum.CreateClass, "创建班级", newId, model.Group_Id, model.School_Id, model.CreateBy);
             }
 
             #region 阶梯报价
@@ -500,11 +502,13 @@ namespace Edu.Module.Course
                 {
                     timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel() { QClassPlanIds = Ids });
                 }
+                DateTime today = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
                 foreach (var item in planList)
                 {
                     item.PlanTimeList = timeList?.Where(qitem => qitem.ClassPlanId == item.ClassPlanId)?.ToList();
                     list.Add(new
                     {
+                        IsEndDate = item.ClassDate <= today ? true : false,
                         item.ClassPlanId,
                         item.ClassId,
                         item.ClassDate,
@@ -531,6 +535,25 @@ namespace Edu.Module.Course
             return class_PlanRepository.DeleteOne(new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), ClassPlanId));
         }
 
+        /// <summary>
+        /// 检查班级上课日期是否存在
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool CheckPlanModule(RB_Class_Plan_ViewModel extModel)
+        {
+            List<WhereHelper> list = new List<WhereHelper>()
+            {
+                new WhereHelper (nameof(RB_Class_Plan_ViewModel.ClassId),extModel.ClassId),
+                new WhereHelper (nameof(RB_Class_Plan_ViewModel.ClassDate),extModel.ClassDate),
+            };
+            if (extModel.ClassPlanId > 0)
+            {
+                list.Add(new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), extModel.ClassPlanId, OperatorEnum.NotEqual));
+            }
+            return class_PlanRepository.Exists(list);
+        }
+
         /// <summary>
         /// 新增修改班级上课计划
         /// </summary>
@@ -543,32 +566,68 @@ namespace Edu.Module.Course
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
-                    {nameof(RB_Class_Plan_ViewModel.ClassRoomId),extModel.ClassRoomId }
+                    {nameof(RB_Class_Plan_ViewModel.ClassRoomId),extModel.ClassRoomId },
+                    {nameof(RB_Class_Plan_ViewModel.TeacherId),extModel.TeacherId },
+                    {nameof(RB_Class_Plan_ViewModel.ClassDate),extModel.ClassDate },
                 };
                 flag = class_PlanRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), extModel.ClassPlanId));
-                if (extModel.PlanTimeList != null && extModel.PlanTimeList.Count > 0)
-                {
-                    foreach (var item in extModel.PlanTimeList)
-                    {
-                        flag = class_TimeRepository.Update(item);
-                    }
-                }
             }
             else
             {
                 var newId = class_PlanRepository.Insert(extModel);
                 extModel.ClassPlanId = newId;
                 flag = newId > 0;
-                if (extModel.PlanTimeList != null && extModel.PlanTimeList.Count > 0)
+            }
+            var oldPlanList= class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel()
+            {
+                ClassId = extModel.ClassId,
+                ClassPlanId = extModel.ClassPlanId,
+            });
+
+            //原来没有计划
+            if (oldPlanList == null || (oldPlanList != null && oldPlanList.Count == 0))
+            {
+                foreach (var item in extModel.PlanTimeList)
                 {
-                    foreach (var item in extModel.PlanTimeList)
+                    item.ClassId = extModel.ClassId;
+                    item.ClassPlanId = extModel.ClassPlanId;
+                    item.Group_Id = extModel.Group_Id;
+                    item.School_Id = extModel.School_Id;
+                    item.ClassTimeId = 0;
+                    flag = class_TimeRepository.Insert(item) > 0;
+                }
+            }
+            //以前有计划
+            else 
+            {
+                //现在没有设置时间【直接删除以前的时间】
+                if (extModel.PlanTimeList == null || (extModel.PlanTimeList != null && extModel.PlanTimeList.Count == 0))
+                {
+                    class_TimeRepository.DeleteClassTimeByPlanIdRepository(extModel.ClassPlanId);
+                }
+                //找出差异的数据
+                var deleteList = oldPlanList.Where(qitem => !extModel.PlanTimeList.Any(oldItem => qitem.ClassTimeId == oldItem.ClassTimeId)).ToList();
+                foreach (var dItem in deleteList)
+                {
+                    if (dItem.ClassTimeId > 0)
+                    {
+                        class_TimeRepository.Delete(dItem.ClassTimeId);
+                    }
+                }
+                foreach (var item in extModel.PlanTimeList)
+                {
+                    item.ClassId = extModel.ClassId;
+                    item.ClassPlanId = extModel.ClassPlanId;
+                    item.Group_Id = extModel.Group_Id;
+                    item.School_Id = extModel.School_Id;
+                    if (item.ClassTimeId == 0)
                     {
-                        item.ClassId = extModel.ClassId;
-                        item.ClassPlanId = extModel.ClassPlanId;
-                        item.Group_Id = extModel.Group_Id;
-                        item.School_Id = extModel.School_Id;
                         flag = class_TimeRepository.Insert(item) > 0;
                     }
+                    else
+                    {
+                        flag = class_TimeRepository.Update(item);
+                    }
                 }
             }
             return flag;

Edu.Module.Course/OrderModule.cs

@@ -134,6 +134,16 @@ namespace Edu.Module.Course
             return list;
         }
 
+        /// <summary>
+        /// 获取班级名称
+        /// </summary>
+        /// <param name="classIds"></param>
+        /// <returns></returns>
+        public List<RB_Class_ViewModel> GetClassNameList(string classIds)
+        {
+            return classRepository.GetClassListRepository(new RB_Class_ViewModel() { Q_ClassIds = classIds });
+        }
+
         /// <summary>
         /// 日语培训下单
         /// </summary>
@@ -154,7 +164,13 @@ namespace Edu.Module.Course
                 {
                     return ApiResult.Failed("人数报超" + (classModel.ClassPersion - (BNum + demodel.GuestNum - orderModel.GuestNum)));
                 }
-
+                #region 验证学生名单数量
+                var glist = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { Group_Id = demodel.Group_Id, OrderId = demodel.OrderId, GuestState = 1 });
+                if (glist.Count() > demodel.GuestNum)
+                {
+                    return ApiResult.Failed("请先取消学生名单再修改订单人员数量");
+                }
+                #endregion
                 decimal MinPrice = orderModel.Class_Price;
                 if (demodel.GuestNum > 1)
                 {
@@ -378,6 +394,10 @@ namespace Edu.Module.Course
         {
             var ordermodel = orderRepository.GetEntity(orderId);
             if (ordermodel == null) { return false; }
+            if (ordermodel.EnterID != userInfo.Id)
+            {
+                return false;
+            }
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_Order_ViewModel.EnterID),careOfPeople}
             };
@@ -1101,7 +1121,7 @@ namespace Edu.Module.Course
             else if (refund >= 0)
             {
                 keyValues.Add(nameof(RB_Order_ViewModel.Refund), refund);
-                LogContent = $"，退款【{refund}】";
+                LogContent = $"，更新退款【{refund}】";
             }
             else { return false; }
             List<WhereHelper> wheres = new List<WhereHelper>() {

Edu.Module.System/MenuModule.cs

@@ -55,6 +55,17 @@ namespace Edu.Module.System
             return menuRepository.GetMenuPageListRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
+        /// <summary>
+        /// 根据岗位编号获取岗位=>岗位角色列表=>角色列表=>角色菜单列表=>菜单列表
+        /// </summary>
+        /// <param name="postIds"></param>
+        /// <param name="MenuType">菜单类型</param>
+        /// <returns></returns>
+        public List<RB_Menu_ViewModel> GetPostMenuListModule(string postIds,int MenuType)
+        {
+            return menuRepository.GetPostMenuListRepository(postIds, MenuType);
+        }
+
         /// <summary>
         /// 新增修改菜单
         /// </summary>
@@ -113,15 +124,31 @@ namespace Edu.Module.System
             return flag;
         }
 
+        /// <summary>
+        /// 获取岗位菜单树形列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="postIds"></param>
+        /// <returns></returns>
+        public List<MenuTree_ViewModel> GetPostMenuTreeModule(RB_Menu_ViewModel query, string postIds = "")
+        {
+            List<RB_Menu_ViewModel> list = new List<RB_Menu_ViewModel>();
+            if (!string.IsNullOrEmpty(postIds))
+            {
+                list = GetPostMenuListModule(postIds,query.MenuType);
+            }
+            return GetMenuTreeModule(list);
+        }
+
         /// <summary>
         /// 获取树形菜单
         /// </summary>
         /// <param name="query"></param>
         /// <param name="roleId">角色编号</param>
+        /// <param name="postIds">岗位编号</param>
         /// <returns></returns>
-        public List<MenuTree_ViewModel> GetTreeMenuModule(RB_Menu_ViewModel query,int roleId=0)
+        public List<MenuTree_ViewModel> GetTreeMenuModule(RB_Menu_ViewModel query, int roleId = 0)
         {
-            List<MenuTree_ViewModel> treeList = new List<MenuTree_ViewModel>();
             List<RB_Menu_ViewModel> list = new List<RB_Menu_ViewModel>();
             if (roleId <= 0)
             {
@@ -131,7 +158,17 @@ namespace Edu.Module.System
             {
                 list = GetRoleMenuListModule(query, roleId: roleId);
             }
-            
+            return GetMenuTreeModule(list);
+        }
+
+        /// <summary>
+        /// 获取菜单树形列表
+        /// </summary>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        private List<MenuTree_ViewModel> GetMenuTreeModule(List<RB_Menu_ViewModel> list)
+        {
+            List<MenuTree_ViewModel> treeList = new List<MenuTree_ViewModel>();
             if (list != null && list.Count > 0)
             {
                 //一级菜单

Edu.Module.User/EmployeeModule.cs

@@ -132,6 +132,10 @@ namespace Edu.Module.User
         /// <returns></returns>
         public virtual bool SetEmployeeModule(Employee_ViewModel extModel)
         {
+            if (extModel.LeaveStatus != Common.Enum.User.LeaveStatusEnum.Departure)
+            {
+                extModel.LeaveTime = null;
+            }
             bool flag = false;
             switch (extModel.AccountType)
             {

Edu.Repository/Course/RB_ClassRepository.cs

@@ -45,6 +45,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId);
                 }
+                if (!string.IsNullOrEmpty(query.Q_ClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_ViewModel.ClassId), query.Q_ClassIds);
+                }
             }
             return Get<RB_Class_ViewModel>(builder.ToString()).ToList();
         }

Edu.Repository/Course/RB_Class_TimeRepository.cs

@@ -57,6 +57,16 @@ WHERE 1=1
             return base.DeleteOne(new VT.FW.DB.WhereHelper(nameof(RB_Class_Time_ViewModel.ClassId), ClassId));
         }
 
+        /// <summary>
+        /// 根据计划删除班级上课时间
+        /// </summary>
+        /// <param name="ClassPlanId">班级编号</param>
+        /// <returns></returns>
+        public bool DeleteClassTimeByPlanIdRepository(int ClassPlanId)
+        {
+            return base.DeleteOne(new VT.FW.DB.WhereHelper(nameof(RB_Class_Time_ViewModel.ClassPlanId), ClassPlanId));
+        }
+
         /// <summary>
         /// 获取班级上课时间
         /// </summary>

Edu.Repository/System/RB_MenuRepository.cs

@@ -117,5 +117,31 @@ WHERE 1=1
             builder.AppendFormat(" ORDER BY {0} DESC ", nameof(RB_Menu_ViewModel.MenuId));
             return GetPage<RB_Menu_ViewModel>(pageIndex,pageSize,out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 根据岗位编号获取岗位=>岗位角色列表=>角色列表=>角色菜单列表=>菜单列表
+        /// </summary>
+        /// <param name="postIds"></param>
+        /// <param name="menuType"></param>
+        /// <returns></returns>
+        public List<RB_Menu_ViewModel> GetPostMenuListRepository(string postIds,int menuType)
+        {
+            if (string.IsNullOrEmpty(postIds))
+            {
+                postIds = "0";
+            }
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM rb_menu 
+WHERE  Status=0 AND MenuType={0} AND MenuId IN
+     (
+		 SELECT Menu_Id
+		 FROM rb_role_permission 
+		 WHERE Role_Id IN(SELECT RoleId FROM rb_role WHERE Status=0 AND RoleId IN(SELECT RoleId FROM rb_post_role WHERE PostId IN({1})))
+	 )
+", menuType, postIds);
+            return Get<RB_Menu_ViewModel>(builder.ToString()).ToList();
+        }
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -125,6 +125,7 @@ namespace Edu.WebApi.Controllers.Course
                 OutRemark = base.ParmJObj.GetStringValue("OutRemark"),
                 CompleteProgress = base.ParmJObj.GetInt("CompleteProgress"),
                 School_Id = base.ParmJObj.GetInt("School_Id"),
+                ClassType=base.ParmJObj.GetInt("ClassType"),
             };
             try
             {
@@ -259,6 +260,10 @@ namespace Edu.WebApi.Controllers.Course
                 TeacherId = base.ParmJObj.GetInt("TeacherId"),
                 Group_Id = base.UserInfo.Group_Id,
             };
+            if (classModule.CheckPlanModule(extModel))
+            {
+                return ApiResult.Failed(message: "已经存在【"+Common.ConvertHelper.FormatDate(extModel.ClassDate)+"】的上课安排!请删除后再操作!");
+            }
             extModel.School_Id = classModule.GetClassModule(extModel.ClassId)?.School_Id ?? 0;
             try
             {

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -82,6 +82,28 @@ namespace Edu.WebApi.Controllers.Course
             return ApiResult.Success("", pageModel);
         }
 
+        /// <summary>
+        /// 获取班级名称
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassNameList()
+        {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
+            string ClassIds = parms.GetStringValue("ClassIds");
+            if (string.IsNullOrEmpty(ClassIds)) {
+                return ApiResult.ParamIsNull("请传递班级ids");
+            }
+
+            var list = orderModule.GetClassNameList(ClassIds);
+            return ApiResult.Success("", list.Select(x => new
+            {
+                x.ClassId,
+                x.ClassName
+            }));
+        }
+
         #endregion
 
         #region 订单管理
@@ -578,6 +600,18 @@ namespace Edu.WebApi.Controllers.Course
         [HttpPost]
         public ApiResult SetClassOrderCareOfClass()
         {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            int ClassId = parms.GetInt("ClassId", 0);
+            if (OrderId <= 0) {
+                return ApiResult.ParamIsNull("请传递订单id");
+            }
+            if (ClassId <= 0) {
+                return ApiResult.ParamIsNull("请传递转入班级id");
+            }
+
+
             return ApiResult.Success();
         }
 

Edu.WebApi/Controllers/User/LoginController.cs

@@ -87,10 +87,10 @@ namespace Edu.WebApi.Controllers.User
 
                 string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
                 string erpToken = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_ERP_User_Key, erpUserInfo);
-                var treeList = menuModule.GetTreeMenuModule(new Model.ViewModel.System.RB_Menu_ViewModel()
+                var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
                 {
                     MenuType = accountType
-                });
+                }, postIds: model.Post_Id.ToString());
                 UserInfo obj = new UserInfo
                 {
                     Id = model.Id,
@@ -138,10 +138,10 @@ namespace Edu.WebApi.Controllers.User
                 UserInfo userInfo = UserReidsCache.GetUserLoginInfo(Uid);
                 if (userInfo != null)
                 {
-                    var treeList = menuModule.GetTreeMenuModule(new Model.ViewModel.System.RB_Menu_ViewModel()
+                    var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
                     {
-                        MenuType =(int) userInfo.AccountType
-                    });
+                        MenuType = (int)userInfo.AccountType
+                    }, userInfo.PostId.ToString());
                     userInfo.MenuList = treeList;
                 }
                 return ApiResult.Success(data: userInfo);

Edu.WebApi/Controllers/User/UserController.cs

@@ -689,13 +689,30 @@ namespace Edu.WebApi.Controllers.User
         [HttpPost]
         public ApiResult SetEmployee()
         {
-            var extModel = Common.Plugin.JsonHelper.DeserializeObject<Employee_ViewModel>(RequestParm.Msg.ToString());
+            var extModel = new Employee_ViewModel()
+            {
+                 AccountId=base.ParmJObj.GetInt("AccountId"),
+                 AccountType=(AccountTypeEnum)base.ParmJObj.GetInt("AccountType"),
+                 EmployeeName=base.ParmJObj.GetStringValue("EmployeeName"),
+                 EmployeeTel=base.ParmJObj.GetStringValue("EmployeeTel"),
+                 UserIcon=base.ParmJObj.GetStringValue("UserIcon"),
+                 Dept_Id=base.ParmJObj.GetInt("Dept_Id"),
+                 Post_Id=base.ParmJObj.GetInt("Post_Id"),
+                 IDCard=base.ParmJObj.GetStringValue("IDCard"),
+                 Sex=base.ParmJObj.GetInt("Sex"),
+                 EntryTime=base.ParmJObj.GetDateTime("EntryTime"),
+                 Address=base.ParmJObj.GetStringValue("Address"),
+                 BirthDate=base.ParmJObj.GetDateTime("BirthDate"),
+                 LeaveStatus=(LeaveStatusEnum)base.ParmJObj.GetInt("LeaveStatus"),
+                 LeaveTime=base.ParmJObj.GetDateTime("LeaveTime"),
+                 Education=(EducationEnum)base.ParmJObj.GetInt("Education"),
+                 School_Id=base.ParmJObj.GetInt("School_Id"),
+            };
             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.School_Id = base.UserInfo.School_Id;
 
             //判断手机号码是否存在
             bool existPhoneResult = employeeModule.ExistPhone(extModel);
@@ -835,7 +852,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel?.BirthDate,
                 BirthDateStr = (extModel?.BirthDate != null ? Convert.ToDateTime(extModel.BirthDate).ToString("MM-dd") : ""),
                 CreateBy = extModel?.CreateBy ?? 0,
-                CreateTime = extModel?.CreateTime,
+                CreateTime = Common.ConvertHelper.FormatDate((extModel?.CreateTime)),
                 DeptName = extModel?.DeptName ?? "",
                 DeptTier = extModel?.DeptTier ?? 0,
                 Dept_Id = extModel?.Dept_Id ?? 0,
@@ -851,8 +868,8 @@ namespace Edu.WebApi.Controllers.User
                 IsBirth = extModel?.IsBirth ?? 0,
                 LeaveStatus = extModel?.LeaveStatus ?? 0,
                 LeaveStatusStr = (extModel?.LeaveStatus ?? 0).ToName(),
-                LeaveTime = extModel?.LeaveTime,
-                PostName = extModel?.PostName,
+                LeaveTime = Common.ConvertHelper.FormatDate(extModel?.LeaveTime),
+                PostName = extModel?.PostName??"",
                 Post_Id = extModel?.Post_Id ?? 0,
                 SchoolName = extModel?.SchoolName ?? "",
                 School_Id = extModel?.School_Id ?? 0,