页面修改

Edu.Model/CacheModel/UserInfo.cs

@@ -112,6 +112,11 @@ namespace Edu.Model.CacheModel
         /// </summary>
         public string PostName { get; set; }
 
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string Email { get; set; }
+
         /// <summary>
         /// 功能权限列表
         /// </summary>

Edu.Model/Entity/Course/RB_Class_Course.cs

+using Edu.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 班级关联课程实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Class_Course
+    {
+		/// <summary>
+		/// 主键
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 班级编号
+		/// </summary>
+		public int ClassId { get; set; }
+
+		/// <summary>
+		/// 课程编号
+		/// </summary>
+		public int CourseId { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 更新时间
+		/// </summary>
+		public DateTime UpdateTime { get; set; }
+
+		/// <summary>
+		/// 删除状态(0-正常,1-禁用)
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+	}
+}

Edu.Model/Entity/Course/RB_Class_LessonComment.cs

 using System;
-using System.Collections.Generic;
-using System.Text;
 using Edu.Common.Enum;
 using VT.FW.DB;
 
 namespace Edu.Model.Entity.Course
 {
+    /// <summary>
+    /// 班级备案评论实体类
+    /// </summary>
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Class_LessonComment
-    {  /// <summary>
+    { 
+        /// <summary>
        /// 教案评论id
        /// </summary>
         public int LessonCommentId { get; set; }

Edu.Model/ViewModel/Course/RB_Class_Course_Extend.cs

+using Edu.Model.Entity.Course;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 班级关联课程扩展实体类
+    /// </summary>
+    public class RB_Class_Course_Extend : RB_Class_Course
+    {
+        /// <summary>
+        /// 班级编号【查询使用】
+        /// </summary>
+        public string QClassIds { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 课程课时
+        /// </summary>
+        public int ClassHours { get; set; }
+
+        /// <summary>
+        /// 课程价格
+        /// </summary>
+        public decimal SellPrice { get; set; }
+    }
+}

Edu.Model/ViewModel/Course/RB_Class_LessonComment_ViewModel.cs

-using System;
-using System.Collections.Generic;
-using System.Text;
-using Edu.Model.Entity.Course;
+using Edu.Model.Entity.Course;
 
 namespace Edu.Model.ViewModel.Course
 {
+    /// <summary>
+    /// 班级备案评论扩展实体类
+    /// </summary>
     public class RB_Class_LessonComment_ViewModel : RB_Class_LessonComment
     {
         /// <summary>

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -187,6 +187,11 @@ namespace Edu.Model.ViewModel.Course
         /// 课程原价
         /// </summary>
         public decimal CourseOriginalPrice { get; set; }
+
+        /// <summary>
+        /// 关联其他课程列表
+        /// </summary>
+        public List<RB_Class_Course_Extend> OtherCourseList { get; set; }
     }
 
     /// <summary>

Edu.Model/ViewModel/User/RB_Account_ViewModel.cs

@@ -72,5 +72,10 @@ namespace Edu.Model.ViewModel.User
         /// 岗位名称
         /// </summary>
         public string PostName { get; set; }
+
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string Email { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -98,15 +98,22 @@ namespace Edu.Module.Course
         /// 课程基础配置
         /// </summary>
         private readonly RB_Class_LessonPlanProjectsRepository ClassLessonPlanProjectsRepository = new RB_Class_LessonPlanProjectsRepository();
-        private readonly RB_Class_LessonCommentRepository classLessonCommentRepository = new RB_Class_LessonCommentRepository();
-
 
+        /// <summary>
+        /// 班级备案评论仓储层对象
+        /// </summary>
+        private readonly RB_Class_LessonCommentRepository classLessonCommentRepository = new RB_Class_LessonCommentRepository();
 
         /// <summary>
         /// 课程基础配置
         /// </summary>
         private readonly RB_Class_LessonPlanRepository ClassLessonPlanRepository = new RB_Class_LessonPlanRepository();
 
+        /// <summary>
+        /// 班级关联课程仓储层对象
+        /// </summary>
+        private readonly RB_Class_CourseRepository class_CourseRepository = new RB_Class_CourseRepository();
+
         /// <summary>
         /// 获取班级列表
         /// </summary>
@@ -167,11 +174,13 @@ namespace Edu.Module.Course
                 var classTimeList = new List<RB_Class_Time_ViewModel>();
                 var classOrderList = new List<RB_Order_ViewModel>();
                 var stepPriceList = new List<RB_Class_StepPrice_ViewModel>();
+                var otherCourseList = new List<RB_Class_Course_Extend>();
                 string ids = string.Join(",", list.Select(qitem => qitem.ClassId));
                 if (!string.IsNullOrEmpty(ids))
                 {
                     classTimeList = class_TimeRepository.GetClassTimeListRepository(ids);
                     classOrderList = orderRepository.GetClassOrderPeopleNum(ids);
+                    otherCourseList= GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids });
                 }
                 if (isGetStepPrice)
                 {
@@ -187,6 +196,7 @@ namespace Edu.Module.Course
                     {
                         item.ClassStepPriceList = stepPriceList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>();
                     }
+                    item.OtherCourseList = otherCourseList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_Course_Extend>();
                 }
             }
             return list;
@@ -400,7 +410,6 @@ namespace Edu.Module.Course
                 }
             }
             #endregion
-
             return flag;
         }
 
@@ -479,8 +488,7 @@ namespace Edu.Module.Course
                     var flag2 = class_PlanRepository.DeleteClassPlanRepository(ids);
                 }
             }
-             
-            List<RB_Class_Plan_ViewModel> classPlanList = new List<RB_Class_Plan_ViewModel>();    
+            List<RB_Class_Plan_ViewModel> classPlanList = new List<RB_Class_Plan_ViewModel>();
             if (model.ClassHours > 0)
             {
                 var srartDate = model.OpenTime;
@@ -631,7 +639,7 @@ namespace Edu.Module.Course
                         var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
                         if (timeList != null && timeList.Count > 0)
                         {
-                            CalcDayClassHoursModule(timeList,planModel.PlanTimeList);
+                            CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
                             classPlanList.Add(planModel);
                         }
                     }
@@ -641,7 +649,6 @@ namespace Edu.Module.Course
                 {
 
                 }
-
             }
             return classPlanList;
         }
@@ -651,7 +658,7 @@ namespace Edu.Module.Course
         /// </summary>
         /// <param name="timeList"></param>
         /// <returns></returns>
-        private double CalcDayClassHoursModule(List<TimeItem> timeList,List<RB_Class_Time_ViewModel> classTimeList)
+        private double CalcDayClassHoursModule(List<TimeItem> timeList, List<RB_Class_Time_ViewModel> classTimeList)
         {
             double dayMinutes = 0;
             foreach (var sItem in timeList)
@@ -1008,7 +1015,7 @@ namespace Edu.Module.Course
         /// <param name="DropOutRemark"></param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public bool UpdateClassStudentDropOutModule(string ids, string dropOutRemark, int classId, int createBy, int group_Id, int school_Id, string studentName)
+        public virtual bool UpdateClassStudentDropOutModule(string ids, string dropOutRemark, int classId, int createBy, int group_Id, int school_Id, string studentName)
         {
             bool flag = false;
             foreach (var item in ids.Split(","))
@@ -1059,7 +1066,6 @@ namespace Edu.Module.Course
                 {
                     {nameof(RB_Student_ViewModel.StuStatus),3},
                 };
-
                 //写日志
                 studentRepository.Update(fileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StudentId));
                 var classLogModel = new Model.Entity.Log.RB_Class_Log()
@@ -1328,7 +1334,6 @@ namespace Edu.Module.Course
         /// <returns></returns>
         public bool SetClassFinance(RB_Class_Finance_ViewModel model)
         {
-
             var oldModel = GetClassFinanceListRepository(model).FirstOrDefault();
             if (oldModel == null || oldModel.FinanceId == 0)
             {
@@ -1450,18 +1455,18 @@ namespace Edu.Module.Course
                     }
                 }
             }
-
             return flag;
         }
+
         /// <summary>
         /// 新增/修改老师教案
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public bool UpdateClassLessPlan(Class_LessonPlan_ViewModel model)
+        public virtual bool UpdateClassLessPlan(Class_LessonPlan_ViewModel model)
         {
-            bool flag = false;
+            bool flag = true;
             if (model.LessonPlanList != null && model.LessonPlanList.Any())
             {
                 foreach (var item in model.LessonPlanList)
@@ -1472,12 +1477,13 @@ namespace Edu.Module.Course
                         {
                             {nameof(RB_Class_LessonPlanDetails_ViewModel.Summary),itemDetails.Summary}
                         };
-                        ClassLessonPlanDetailsRepository.Update(fileds, new WhereHelper(nameof(RB_Class_LessonPlanDetails_ViewModel.LessonPlanDetailsId), itemDetails.LessonPlanDetailsId));
+                        if (flag)
+                        {
+                            flag = ClassLessonPlanDetailsRepository.Update(fileds, new WhereHelper(nameof(RB_Class_LessonPlanDetails_ViewModel.LessonPlanDetailsId), itemDetails.LessonPlanDetailsId));
+                        }
                     }
                 }
-                return true;
             }
-
             return flag;
         }
 
@@ -1535,10 +1541,6 @@ namespace Edu.Module.Course
             return ClassLessonPlanRepository.GetLessonPlanListRepository(query);
         }
 
-
-
-
-
         /// <summary>
         /// 获取老师计划列表
         /// </summary>
@@ -1802,5 +1804,67 @@ namespace Edu.Module.Course
             var flag = classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), ClassId));
             return flag;
         }
+
+        #region 班级课程关联管理
+
+        /// <summary>
+        /// 新增修改班级关联课程
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetClassCourseModule(List<RB_Class_Course_Extend> list)
+        {
+            bool flag = false;
+            foreach (var model in list)
+            {
+                var newModel = class_CourseRepository.GetClassCourseListRepository(new RB_Class_Course_Extend()
+                {
+                    CourseId = model.CourseId,
+                    ClassId = model.ClassId
+                })?.FirstOrDefault();
+                model.Id = newModel?.Id ?? 0;
+                if (model.Id > 0)
+                {
+                    Dictionary<string, object> fileds = new Dictionary<string, object>()
+                    {
+                        {nameof(RB_Class_Course_Extend.UpdateBy),model.UpdateBy },
+                        {nameof(RB_Class_Course_Extend.UpdateTime),model.UpdateTime },
+                    };
+                    flag = class_CourseRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Course_Extend.Id), model.Id));
+                }
+                else
+                {
+                    var newId = class_CourseRepository.Insert(model);
+                    model.Id = newId;
+                    flag = newId > 0;
+                }
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取班级关联课程列表
+        /// </summary>
+        /// <param name="query"></param>
+        public List<RB_Class_Course_Extend> GetClassCourseListModule(RB_Class_Course_Extend query)
+        {
+            return class_CourseRepository.GetClassCourseListRepository(query);
+        }
+
+        /// <summary>
+        /// 删除班级关联课程
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveClassCourseModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Class_Course_Extend.Status),(int)DateStateEnum.Delete },
+            };
+            var flag = class_CourseRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Course_Extend.Id), Id));
+            return flag;
+        }
+        #endregion
     }
 }

Edu.Repository/Course/RB_Class_CourseRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 班级关联课程仓储层
+    /// </summary>
+    public class RB_Class_CourseRepository : BaseRepository<RB_Class_Course>
+    {
+        /// <summary>
+        /// 获取班级关联课程列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Course_Extend> GetClassCourseListRepository(RB_Class_Course_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* ,IFNULL(B.CourseName,'') AS CourseName,IFNULL(B.ClassHours,0) AS ClassHours,IFNULL(B.SellPrice,0) AS SellPrice
+FROM RB_Class_Course AS A LEFT JOIN rb_course AS B ON A.CourseId=B.CourseId
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Course_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Course_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Course_Extend.ClassId), query.ClassId);
+                }
+                if (query.CourseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Course_Extend.CourseId), query.CourseId);
+                }
+                if (!string.IsNullOrEmpty(query.QClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Class_Course_Extend.ClassId), query.QClassIds);
+                }
+            }
+            return Get<RB_Class_Course_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/Course/RB_Class_LessonCommentRepository.cs

@@ -7,6 +7,9 @@ using Edu.Model.ViewModel.Course;
 
 namespace Edu.Repository.Course
 {
+    /// <summary>
+    /// 班级备案评论仓储层
+    /// </summary>
     public class RB_Class_LessonCommentRepository : BaseRepository<RB_Class_LessonComment>
     {
         /// <summary>

Edu.Repository/User/RB_AccountRepository.cs

@@ -136,17 +136,17 @@ SELECT A.*,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName,
 FROM 
 (
 		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
-              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email
 		FROM rb_account AS A INNER JOIN rb_manager AS B ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1  {0}
 		UNION ALL
 		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
-              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.TeacherName,'') AS AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.TeacherName,'') AS AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email
 		FROM rb_account AS A INNER JOIN rb_teacher AS B ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1  {0}
 		UNION ALL
 		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
-              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.AssistName,'') AS AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.AssistName,'') AS AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email
 		FROM rb_account AS A INNER JOIN rb_assist AS B ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1  {0}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId

Edu.WebApi/Controllers/User/LoginController.cs

@@ -116,7 +116,7 @@ namespace Edu.WebApi.Controllers.User
                 var actionList = menuModule.GetPostMenuFunctionListModule(model.Post_Id.ToString());
                 //上传配置
                 var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
-
+                
                 UserInfo obj = new UserInfo
                 {
                     Id = model.Id,
@@ -139,6 +139,7 @@ namespace Edu.WebApi.Controllers.User
                     DeptName = model.DeptName,
                     PostId = model.Post_Id,
                     PostName = model.PostName,
+                    Email=model.Email,
                     ActionMenuList = actionList?.Select(qitem => new { qitem.FunctionCode, qitem.FunctionName, qitem.MenuName, qitem.MenuUrl }),
                     UploadConfig = new
                     {
@@ -396,7 +397,7 @@ namespace Edu.WebApi.Controllers.User
                 }
                 var result = new
                 {
-                    TeacherName = modelTeacher.FirstOrDefault()?.TeacherName,
+                    modelTeacher.FirstOrDefault()?.TeacherName,
                     tempList = tempList.Select(x => new { x.RoomName, x.TeacherName, NewPlanDateTime = x.NewPlanDateTime.HasValue ? x.NewPlanDateTime.Value.ToString("yyyy-MM-dd HH:mm") : "", NewEndPlanDateTime = x.NewEndPlanDateTime.HasValue ? x.NewEndPlanDateTime.Value.ToString("yyyy-MM-dd HH:mm") : "" })
                 };
                 return ApiResult.Failed(message: $"本教室没有找到您的课", data: result);