页面修改

Edu.Module.Course/ClassModule.cs

@@ -129,6 +129,21 @@ namespace Edu.Module.Course
             return list;
         }
 
+
+
+        /// <summary>
+        /// 获取班级日志分页列表
+        /// </summary>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowsCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Class_Log_ViewModel> GetClassLogPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Class_Log_ViewModel query)
+        {
+            return classLogRepository.GetClassLogPageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
         /// <summary>
         /// 检查班级是否存在
         /// </summary>
@@ -195,7 +210,17 @@ 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);
+                var classLogModel = new Model.Entity.Log.RB_Class_Log()
+                {
+                    LogType = Common.Enum.Course.ClassLogTypeEnum.CreateClass,
+                    LogContent = "创建班级",
+                    ClassId = newId,
+                    Group_Id = model.Group_Id,
+                    School_Id = model.School_Id,
+                    CreateBy = model.CreateBy,
+                    CreateTime = System.DateTime.Now
+                };
+                classLogRepository.AddClassLogRepository(classLogModel);
             }
 
             #region 阶梯报价
@@ -275,7 +300,7 @@ namespace Edu.Module.Course
 
             //班级上课计划列表
             List<RB_Class_Plan_ViewModel> classPlanList = CreateClassPlanList(model, defaultPlanTimeList);
-   
+
             model.ClassPlanList = classPlanList;
             if (model.ClassPlanList != null && model.ClassPlanList.Count > 0)
             {
@@ -309,13 +334,13 @@ namespace Edu.Module.Course
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        private List<RB_Class_Plan_ViewModel> CreateClassPlanList(RB_Class_ViewModel model,List<RB_Class_Time_ViewModel> defaultPlanTimeList)
+        private List<RB_Class_Plan_ViewModel> CreateClassPlanList(RB_Class_ViewModel model, List<RB_Class_Time_ViewModel> defaultPlanTimeList)
         {
             List<RB_Class_Plan_ViewModel> classPlanList = new List<RB_Class_Plan_ViewModel>();
             double totalMinutes = 0;
             foreach (var item in defaultPlanTimeList)
             {
-                var startDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + item.StartTime+":00");
+                var startDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + item.StartTime + ":00");
                 var endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + item.EndTime + ":00");
                 TimeSpan span = endDate.Subtract(startDate);
                 if (span.TotalMinutes > 0)
@@ -533,9 +558,16 @@ namespace Edu.Module.Course
                 {
                     extModel.DefaultTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Class_Time_ViewModel>>(extModel.DefaultTimeJson);
                 }
+<<<<<<< HEAD
                 if (!string.IsNullOrEmpty(extModel.DateJson) && extModel.ClassStyle!= Common.Enum.Course.ClassStyleEnum.OnLine)
                 { 
                   extModel.WeekDayList= Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
+=======
+
+                if (!string.IsNullOrEmpty(extModel.DateJson) && extModel.ClassStyle != Common.Enum.Course.ClassStyleEnum.OnLine)
+                {
+                    extModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
+>>>>>>> 492c78a88ff90bf7554f40fab00e295fd4abd531
                 }
             }
             return extModel;
@@ -758,12 +790,14 @@ namespace Edu.Module.Course
         /// </summary>
         /// <param name="classId">班级编号</param>
         /// <returns></returns>
-        public object GetClassStudentListModule(int classId)
+        public object GetClassStudentListModule(int classId, int school_Id, int group_Id)
         {
             List<object> list = new List<object>();
             var orderStudentList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel()
             {
-                ClassId = classId
+                ClassId = classId,
+                Group_Id = group_Id,
+                School_Id = school_Id
             }).Where(x => x.GuestState == 1).ToList();
             var classModel = GetClassModule(classId);
             var courseModel = courseRepository.GetEntity((classModel?.CouseId ?? 0));
@@ -826,8 +860,17 @@ namespace Edu.Module.Course
             }
             if (flag)
             {
-
-                classLogRepository.AddClassLogRepository(Common.Enum.Course.ClassLogTypeEnum.DropOutStudent, studentName + " 学员因" + dropOutRemark + "退课", classId, group_Id, school_Id, createBy);
+                var classLogModel = new Model.Entity.Log.RB_Class_Log()
+                {
+                    LogType = Common.Enum.Course.ClassLogTypeEnum.DropOutStudent,
+                    LogContent = studentName + " 学员因" + dropOutRemark + "退课",
+                    ClassId = classId,
+                    Group_Id = group_Id,
+                    School_Id = school_Id,
+                    CreateBy = createBy,
+                    CreateTime = System.DateTime.Now
+                };
+                classLogRepository.AddClassLogRepository(classLogModel);
             }
             return flag;
         }
@@ -853,7 +896,17 @@ namespace Edu.Module.Course
 
                 //写日志
                 studentRepository.Update(fileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StudentId));
-                classLogRepository.AddClassLogRepository(Common.Enum.Course.ClassLogTypeEnum.AddStudent, CreateName + "邀请  " + model.GuestName + " 加入班级", model.ClassId, model.Group_Id, model.School_Id, model.CreateBy);
+                var classLogModel = new Model.Entity.Log.RB_Class_Log()
+                {
+                    LogType = Common.Enum.Course.ClassLogTypeEnum.AddStudent,
+                    LogContent = CreateName + "邀请  " + model.GuestName + " 加入班级",
+                    ClassId = model.ClassId,
+                    Group_Id = model.Group_Id,
+                    School_Id = model.School_Id,
+                    CreateBy = model.CreateBy,
+                    CreateTime = System.DateTime.Now
+                };
+                classLogRepository.AddClassLogRepository(classLogModel);
             }
             return flag;
         }

Edu.Repository/Log/RB_Class_LogRepository.cs

@@ -57,8 +57,9 @@ WHERE 1=1
         /// <param name="School_Id">校区编号</param>
         /// <param name="CreateBy">创建人</param>
         /// <returns></returns>
-        public bool AddClassLogRepository(ClassLogTypeEnum logType, string LogContent, int ClassId, int Group_Id, int School_Id, int CreateBy)
+        public bool AddClassLogRepository(RB_Class_Log model )
         {
+<<<<<<< .merge_file_a16616
             var model = new RB_Class_Log()
             {
                 LogType = logType,
@@ -69,6 +70,9 @@ WHERE 1=1
                 CreateBy = CreateBy,
                 CreateTime=DateTime.Now,
             };
+=======
+           
+>>>>>>> .merge_file_a01344
             return base.Insert(model) > 0;
         }
     }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -359,7 +359,8 @@ namespace Edu.WebApi.Controllers.Course
         public ApiResult GetClassStudent()
         {
             var classId = base.ParmJObj.GetInt("ClassId");
-            var data = classModule.GetClassStudentListModule(classId);
+            var schoolId = base.ParmJObj.GetInt("School_Id");
+            var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id);
             return ApiResult.Success(data: data);
         }
 
@@ -398,7 +399,7 @@ namespace Edu.WebApi.Controllers.Course
             var orderGuestList = classModule.GetOrderGuest(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId });
             var checkLogList = classModule.GetClassCheckListRepository(new RB_Class_Check_ViewModel { Group_Id = data.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId, StartDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
             List<object> guestList = new List<object>();
-            foreach (var item in orderGuestList)
+            foreach (var item in orderGuestList.Where(x => x.GuestState == 1))
             {
                 guestList.Add(new
                 {
@@ -410,10 +411,10 @@ namespace Edu.WebApi.Controllers.Course
                     CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
                     item.Mobile,
                     item.OrderId,
-                    IsCheck = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.CheckStatus??-1 : -1
+                    IsCheck = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.CheckStatus ?? -1 : -1
                 });
             }
-            return ApiResult.Success(data: new { data.TeacherName, data.RoomName, TotalHour = Convert.ToInt32(totalMinutes / 60), ClassNum = Convert.ToInt32(totalMinutes / 45), ClassDate = data.ClassDate.ToString("yyyy-MM-dd"), GuestList= guestList });
+            return ApiResult.Success(data: new { data.TeacherName, data.RoomName, TotalHour = Convert.ToInt32(totalMinutes / 60), ClassNum = Convert.ToInt32(totalMinutes / 45), ClassDate = data.ClassDate.ToString("yyyy-MM-dd"), GuestList = guestList });
         }
 
         /// <summary>
@@ -458,6 +459,7 @@ namespace Edu.WebApi.Controllers.Course
             model.UpdateBy = base.UserInfo.Id;
             model.CreateTime = System.DateTime.Now;
             model.UpdateTime = model.CreateTime;
+            model.Group_Id = base.UserInfo.Group_Id;
             bool result = classModule.AddClassStudentDropOutModule(model, base.UserInfo.AccountName);
             return result? ApiResult.Success():ApiResult.Failed();
         }
@@ -552,6 +554,35 @@ namespace Edu.WebApi.Controllers.Course
             return result ? ApiResult.Success() : ApiResult.Failed("签到失败");
         }
 
+
+        /// <summary>
+        /// 获取班级日志
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassLogPageList()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new RB_Class_Log_ViewModel()
+            {
+                Group_Id = base.UserInfo.Group_Id,
+                School_Id = base.ParmJObj.GetInt("School_Id"),
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = classModule.GetClassLogPageListRepository(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
         #endregion
 
         #region 获取学员信息