提交代码

Edu.Common/GlobalKey.cs

@@ -24,5 +24,9 @@
         /// ERP用户TokenKey
         /// </summary>
         public const string JWT_ERP_User_Key = "userInfo";
+        /// <summary>
+        /// app学生用户TokenKey
+        /// </summary>
+        public const string JWT_App_Student_Key = "App_Student";
     }
 }

Edu.Common/Plugin/StringHelper.cs

@@ -113,7 +113,7 @@ namespace Edu.Common.Plugin
         {
             string[] str = new string[] { "日", "月", "火", "水", "木", "金", "土" };
             int week = int.Parse(day.DayOfWeek.ToString("D"));
-            return "星期" + str[week];
+            return  str[week];
         }
 
 

Edu.Model/CacheModel/AppStudentInfo.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.User;
+using Edu.Model.ViewModel.System;
+using System.Collections.Generic;
+
+namespace Edu.Model.CacheModel
+{
+    /// <summary>
+    /// app学生用户缓存
+    /// </summary>
+    public class AppStudentInfo
+    {
+        /// <summary>
+        /// 账号编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 账号名称
+        /// </summary>
+        public string AccountName { get; set; }
+
+
+        /// <summary>
+        /// 请求来源
+        /// </summary>
+        public ApiRequestFromEnum ApiRequestFromEnum { get; set; }
+
+        /// <summary>
+        /// 账号类型(1-管理端，2,-教师端，3-助教，4-学生)
+        /// </summary>
+        public AccountTypeEnum AccountType { get; set; }
+
+
+        /// <summary>
+        /// 对应的账户id
+        /// </summary>
+        public int AccountId { get; set; }
+
+        /// <summary>
+        /// 学校名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 集团名称
+        /// </summary>
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// Token验证
+        /// </summary>
+        public string Token { get; set; }
+
+     
+
+        /// <summary>
+        /// 集团Logo
+        /// </summary>
+        public string GroupLogo { get; set; }
+
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string UserIcon { get; set; }
+
+
+        /// <summary>
+        /// 上传配置
+        /// </summary>
+        public object UploadConfig { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/CacheModel/UserInfo.cs

@@ -30,6 +30,7 @@ namespace Edu.Model.CacheModel
         /// </summary>
         public string AccountName { get; set; }
 
+
         /// <summary>
         /// 请求来源
         /// </summary>
@@ -40,6 +41,12 @@ namespace Edu.Model.CacheModel
         /// </summary>
         public AccountTypeEnum AccountType { get; set; }
 
+
+        /// <summary>
+        /// 对应的账户id
+        /// </summary>
+        public int AccountId { get; set; }
+
         /// <summary>
         /// 学校名称
         /// </summary>

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
+{
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Class_LessonComment
+    {  /// <summary>
+       /// 教案评论id
+       /// </summary>
+        public int LessonCommentId { get; set; }
+
+        /// <summary>
+        /// 教案id
+        /// </summary>
+        public int LessonPlanId { get; set; }
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public int ClassId { get; set; }
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public int Score { get; set; }
+
+        public string Comment { get; set; }
+
+        /// <summary>
+        /// 上课计划编号
+        /// </summary>
+        public int ClassPlanId { 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>
+        /// 删除状态(0-正常,1-禁用)
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+    }
+}

Edu.Model/ViewModel/Course/Class_LessonPlan_ViewModel.cs

@@ -67,6 +67,12 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public DateTime UpdateTime { get; set; }
 
+
+        /// <summary>
+        /// 中途休息时间
+        /// </summary>
+        public string RestTime { get; set; }
+
         /// <summary>
         /// 老师教案详情
         /// </summary>

Edu.Model/ViewModel/Course/RB_Class_LessonComment_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.Course;
+
+namespace Edu.Model.ViewModel.Course
+{
+    public class RB_Class_LessonComment_ViewModel : RB_Class_LessonComment
+    {
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+    }
+}

Edu.Model/ViewModel/Course/RB_Class_LessonPlanDetails_ViewModel.cs

@@ -8,8 +8,13 @@ namespace Edu.Model.ViewModel.Course
     /// <summary>
     /// 老师教案详细内容
     /// </summary>
-    public class RB_Class_LessonPlanDetails_ViewModel: RB_Class_LessonPlanDetails
+    public class RB_Class_LessonPlanDetails_ViewModel : RB_Class_LessonPlanDetails
     {
         public string LessonPlanIds { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string DurationEndTime { get; set; }
     }
 }

Edu.Module.Course/ClassModule.cs

@@ -103,6 +103,9 @@ 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>
         /// 课程基础配置
@@ -1264,7 +1267,33 @@ namespace Edu.Module.Course
 
             return flag;
         }
+        /// <summary>
+        /// 新增/修改老师教案
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [TransactionCallHandler]
+        public bool UpdateClassLessPlan(Class_LessonPlan_ViewModel model)
+        {
+            bool flag = false;
+            if (model.LessonPlanList != null && model.LessonPlanList.Any())
+            {
+                foreach (var item in model.LessonPlanList)
+                {
+                    foreach (var itemDetails in item.LessonPlanDetailsList)
+                    {
+                        Dictionary<string, object> fileds = new Dictionary<string, object>()
+                        {
+                            {nameof(RB_Class_LessonPlanDetails_ViewModel.Summary),itemDetails.Summary}
+                        };
+                        ClassLessonPlanDetailsRepository.Update(fileds, new WhereHelper(nameof(RB_Class_LessonPlanDetails_ViewModel.LessonPlanDetailsId), itemDetails.LessonPlanDetailsId));
+                    }
+                }
+                return true;
+            }
 
+            return flag;
+        }
 
         /// <summary>
         /// 获取老师教案详情分页列表
@@ -1359,6 +1388,40 @@ namespace Edu.Module.Course
             return planList;
         }
 
+        /// <summary>
+        /// 获取备案评论分页列表
+        /// </summary>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowsCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Class_LessonComment_ViewModel> GetLessonCommentList(RB_Class_LessonComment_ViewModel query)
+        {
+            return classLessonCommentRepository.GetLessonCommentList(query);
+        }
+
+        /// <summary>
+        /// 评论/删除评论
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetLessonComment(RB_Class_LessonComment_ViewModel model)
+        {
+            if (model.LessonCommentId == 0)
+            {
+                return classLessonCommentRepository.Insert(model) > 0;
+            }
+            else
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Class_LessonComment_ViewModel.Status),1}
+                };
+                return classLessonCommentRepository.Update(fileds, new WhereHelper(nameof(RB_Class_LessonComment_ViewModel.LessonCommentId), model.LessonCommentId));
+            }
+        }
+
         #endregion
     }
 }

Edu.Repository/Course/RB_Class_LessonCommentRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+
+namespace Edu.Repository.Course
+{
+    public class RB_Class_LessonCommentRepository : BaseRepository<RB_Class_LessonComment>
+    {
+        /// <summary>
+        /// 获取备案分页列表
+        /// </summary>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowsCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Class_LessonComment_ViewModel> GetLessonCommentList(RB_Class_LessonComment_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"SELECT *  FROM RB_Class_LessonComment  WHERE 1=1  AND Status=0");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.School_Id), query.School_Id);
+                }
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.ClassId), query.ClassId);
+                }
+                if (query.ClassPlanId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.ClassPlanId), query.ClassPlanId);
+                }
+                if (query.LessonPlanId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.LessonPlanId), query.LessonPlanId);
+                }
+            }
+            builder.Append(" ORDER BY CreateTime DESC ");
+            return Get<RB_Class_LessonComment_ViewModel>(builder.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/Course/RB_Class_LessonPlanDetailsRepository.cs

@@ -67,7 +67,7 @@ namespace Edu.Repository.Course
                 }
                 if ( !string.IsNullOrWhiteSpace(query.LessonPlanIds))
                 {
-                    builder.AppendFormat(" AND {0} in ({1}) ", nameof(RB_Class_LessonPlanDetails.LessonPlanId), query.LessonPlanId);
+                    builder.AppendFormat(" AND {0} in ({1}) ", nameof(RB_Class_LessonPlanDetails.LessonPlanId), query.LessonPlanIds);
                 }
             }
             return Get<RB_Class_LessonPlanDetails_ViewModel>(builder.ToString()).ToList();

Edu.Repository/Course/RB_Class_LessonPlanProjectsRepository.cs

@@ -67,7 +67,7 @@ namespace Edu.Repository.Course
                 }
                 if (!string.IsNullOrWhiteSpace(query.LessonPlanIds))
                 {
-                    builder.AppendFormat(" AND {0} in ({1}) ", nameof(RB_Class_LessonPlanProjects.LessonPlanId), query.LessonPlanId);
+                    builder.AppendFormat(" AND {0} in ({1}) ", nameof(RB_Class_LessonPlanProjects.LessonPlanId), query.LessonPlanIds);
                 }
             }
             return Get<RB_Class_LessonPlanProjects_ViewModel>(builder.ToString()).ToList();

Edu.Repository/Course/RB_Class_LessonPlanRepository.cs

@@ -73,6 +73,10 @@ namespace Edu.Repository.Course
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonPlan.LessonPlanId), query.LessonPlanId);
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonPlan.CreateBy), query.CreateBy);
+                }
                 if (query.ClassId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonPlan.ClassId), query.ClassId);

Edu.WebApi/Controllers/APP/APPStudentLoginController.cs

@@ -67,14 +67,14 @@ namespace Edu.WebApi.Controllers.APP
                     return ApiResult.Failed(message: $"此账号【{ account }】已禁用");
                 }
                 //生成教育token
-                IUserInfoToken eduUserInfo = new EduUserInfoToken()
-                {
-                    requestFrom = Common.Enum.ApiRequestFromEnum.AppStudent,
-                    uid = model.Id.ToString()
-                };
-                //上传配置
-                var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
-                string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
+                //IUserInfoToken eduUserInfo = new AppStudentInfoToken()
+                //{
+                //    requestFrom = Common.Enum.ApiRequestFromEnum.AppStudent,
+                //    uid = model.Id.ToString()
+                //};
+                ////上传配置
+                //var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
+                //string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_App_Student_Key, eduUserInfo);
                 //UserInfo obj = new UserInfo
                 //{
                 //    Id = model.Id,
@@ -101,7 +101,7 @@ namespace Edu.WebApi.Controllers.APP
                 //        uploadConfig?.UploadDomain
                 //    }
                 //};
-                //UserReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
+                //Cache.User.UserReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
                 return ApiResult.Success();
             }
            // return ApiResult.Success();

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -747,6 +747,28 @@ namespace Edu.WebApi.Controllers.Course
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+
+
+
+        /// <summary>
+        /// 新增修改老师备案
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult UpdateClassLessPlan()
+        {
+            var query = Common.Plugin.JsonHelper.DeserializeObject<Class_LessonPlan_ViewModel>(RequestParm.Msg.ToString());
+            query.Group_Id = base.UserInfo.Group_Id;
+            query.CreateBy = base.UserInfo.Id;
+            query.UpdateBy = base.UserInfo.Id;
+            query.UpdateTime = System.DateTime.Now;
+            query.CreateTime = System.DateTime.Now;
+
+            bool flag = classModule.UpdateClassLessPlan(query);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
+
         public ApiResult GetClassLessPlan()
         {
             var extModel = new RB_Class_LessonPlan_ViewModel()
@@ -759,19 +781,27 @@ namespace Edu.WebApi.Controllers.Course
             };
             Class_LessonPlan_ViewModel model = new Class_LessonPlan_ViewModel();
             //获取班级上课新以及老师名称
-            var planDate = classModule.GetClassPlanListRepository(new RB_Class_Plan_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = extModel.School_Id, ClassId = extModel.ClassId, ClassPlanId = extModel.ClassPlanId }).FirstOrDefault();
+            var planDate = classModule.GetClassPlanListRepository(new RB_Class_Plan_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = extModel.ClassId, ClassPlanId = extModel.ClassPlanId }).FirstOrDefault();
             if (planDate == null || planDate.ClassPlanId == 0)
             {
                 return ApiResult.Failed("班级上课计划不存在");
             }
-            var planTiemList = classModule.GetClassTimeListRepository(new RB_Class_Time_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = extModel.School_Id, ClassId = extModel.ClassId, ClassPlanId = extModel.ClassPlanId });
+            var planTiemList = classModule.GetClassTimeListRepository(new RB_Class_Time_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = extModel.ClassId, ClassPlanId = extModel.ClassPlanId });
             model.TeacherName = planDate.TeacherName;
             model.WorkDate = planDate.ClassDate.ToString("yyyy年MM月dd日");
             model.WeekStr = StringHelper.GetJapanWeekChar(planDate.ClassDate);
+            DateTime startTime = System.DateTime.Now;
+            DateTime endTime = System.DateTime.Now;
+            int planTimeNum = 0;
             if (planTiemList != null && planTiemList.Any())
             {
+                planTimeNum = planTiemList.Count();
                 planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.StartTime);
                 model.DayTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:ss");
+                startTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime));
+                endTime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime));
+
+                model.RestTime = endTime.Subtract(startTime).TotalMilliseconds.ToString();
                 planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.EndTime);
                 model.DayTime = model.DayTime + "~" + planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:ss");
             }
@@ -783,8 +813,8 @@ namespace Edu.WebApi.Controllers.Course
             if (lessonPlanList != null && lessonPlanList.Any())
             {
                 string lessonPlanIds = string.Join(",", lessonPlanList.Select(x => x.LessonPlanId));
-                var detailsList = classModule.GetLessonPlanDetailsListRepository(new RB_Class_LessonPlanDetails_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = extModel.School_Id, LessonPlanIds = lessonPlanIds });
-                var projectList = classModule.GetLessonPlanProjectsListRepository(new RB_Class_LessonPlanProjects_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = extModel.School_Id, LessonPlanIds = lessonPlanIds });
+                var detailsList = classModule.GetLessonPlanDetailsListRepository(new RB_Class_LessonPlanDetails_ViewModel { Group_Id = base.UserInfo.Group_Id, LessonPlanIds = lessonPlanIds });
+                var projectList = classModule.GetLessonPlanProjectsListRepository(new RB_Class_LessonPlanProjects_ViewModel { Group_Id = base.UserInfo.Group_Id, LessonPlanIds = lessonPlanIds });
                 model.CourseNum = lessonPlanList.FirstOrDefault()?.CourseNum ?? 0;
                 model.LessonPlan = lessonPlanList.FirstOrDefault()?.LessonPlan;
                 model.CreateBy = lessonPlanList.FirstOrDefault()?.CreateBy ?? 0;
@@ -794,11 +824,23 @@ namespace Edu.WebApi.Controllers.Course
                 model.IsTemplate = lessonPlanList.FirstOrDefault()?.IsTemplate ?? 0;
                 model.LessonPlanList = new List<RB_Class_LessonPlan_ViewModel>();
                 model.LessonPlanList = lessonPlanList;
+
                 foreach (var item in model.LessonPlanList)
                 {
                     item.LessonPlanDetailsList = new List<RB_Class_LessonPlanDetails_ViewModel>();
                     item.LessonPlanProjectsList = new List<RB_Class_LessonPlanProjects_ViewModel>();
                     item.LessonPlanDetailsList = detailsList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
+                    foreach (var itemDetails in item.LessonPlanDetailsList)
+                    {
+                        if (planTimeNum == 1)
+                        {
+                            itemDetails.DurationEndTime = startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
+                        }
+                        else
+                        {
+                            itemDetails.DurationEndTime = (startTime.AddMinutes(itemDetails.Duration) < endTime) ? startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm") : endTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
+                        }
+                    }
                     item.LessonPlanProjectsList = projectList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
                 }
             }
@@ -809,9 +851,9 @@ namespace Edu.WebApi.Controllers.Course
         {
             var extModel = new RB_Class_LessonPlan_ViewModel()
             {
-                ClassId = base.ParmJObj.GetInt("ClassId"),
+                CreateBy = base.UserInfo.Id,
                 Group_Id = base.UserInfo.Group_Id,
-                School_Id = base.ParmJObj.GetInt("School_Id"),
+                // School_Id = base.ParmJObj.GetInt("School_Id"),
                 IsTemplate = 1
             };
             var lessonPlanList = classModule.GetLessonPlanListRepository(extModel);
@@ -860,15 +902,26 @@ namespace Edu.WebApi.Controllers.Course
         public ApiResult GetTeacherPlan()
         {
 
-
             var query = new RB_Class_ViewModel()
             {
                 Group_Id = base.UserInfo.Group_Id,
-                School_Id = base.ParmJObj.GetInt("School_Id"),
-                Teacher_Id = base.ParmJObj.GetInt("Teacher_Id"),
+                // School_Id = base.ParmJObj.GetInt("School_Id", 0),
+                Teacher_Id = base.ParmJObj.GetInt("Teacher_Id", 0),
                 StartTime = base.ParmJObj.GetStringValue("StartTime"),
                 EndTime = base.ParmJObj.GetStringValue("EndTime"),
             };
+            if (query.Teacher_Id == 0)
+            {
+                if (base.UserInfo.AccountType == Common.Enum.User.AccountTypeEnum.Teacher)
+                {
+                    query.Teacher_Id = base.UserInfo.AccountId;
+                    if (query.Teacher_Id == 0)
+                    {
+                        return ApiResult.Failed("请传入老师id");
+                    }
+                }
+            }
+
             var data = classModule.GetTeacherPlanModule(query);
 
             List<object> result = new List<object>();
@@ -879,8 +932,10 @@ namespace Edu.WebApi.Controllers.Course
 
             for (int i = 0; i <= sp.Days; i++)
             {
+                int IsLessonStatus = 0;//0-未备课，1-部分，2-全部
                 List<object> planList = new List<object>();
                 var plan = data.Where(x => x.ClassDate.ToString("yyyy-MM-dd") == startTime.AddDays(i).ToString("yyyy-MM-dd"));
+                string DayTime = string.Empty;
                 foreach (var item in plan)
                 {
                     foreach (var itemTime in item.PlanTimeList)
@@ -898,10 +953,34 @@ namespace Edu.WebApi.Controllers.Course
                             GuestStr = (item.GuestList != null && item.GuestList.Any()) ? string.Join(",", item.GuestList.Select(x => x.GuestName)) : ""
                         });
                     }
+                    if (plan.Where(x => x.LessonPlanNum > 0).Count() < plan.Count() && plan.Where(x => x.LessonPlanNum > 0).Count() > 0)
+                    {
+                        IsLessonStatus = 1;
+                    }
+                    else if (plan.Where(x => x.LessonPlanNum > 0).Count() == plan.Count())
+                    {
+                        IsLessonStatus = 2;
+                    }
+                    else
+                    {
+                        IsLessonStatus = 0;
+                    }
+                    if (item.PlanTimeList != null && item.PlanTimeList.Any())
+                    {
+                        item.PlanTimeList.ForEach(x => x.NewPlanDateTime = item.ClassDate.ToString("yyyy-MM-dd") + " " + x.StartTime);
+                        DayTime = item.PlanTimeList.Min(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:ss");
+                        item.PlanTimeList.ForEach(x => x.NewPlanDateTime = item.ClassDate.ToString("yyyy-MM-dd") + " " + x.EndTime);
+                        DayTime = DayTime + "~" + item.PlanTimeList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:ss");
+                    }
                 }
                 result.Add(new
                 {
-                    DateStr = i.ToString("yyyy年MM月dd日"),
+                    IsLessonStatus,
+                    DayTime,
+                    DateYear = startTime.AddDays(i).ToString("yyyy"),
+                    DateMonth = startTime.AddDays(i).ToString("MM"),
+                    DateDay = startTime.AddDays(i).ToString("dd"),
+                    WeekStr = StringHelper.GetJapanWeekChar(startTime.AddDays(i)),
                     PlanList = planList
                 });
             }
@@ -909,6 +988,58 @@ namespace Edu.WebApi.Controllers.Course
         }
 
 
+        /// <summary>
+        /// 获取老师教案评论
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetLessonCommentList()
+        {
+            var query = new RB_Class_LessonComment_ViewModel()
+            {
+                ClassPlanId = base.ParmJObj.GetInt("ClassPlanId"),
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+                Group_Id = base.UserInfo.Group_Id,
+                //School_Id = base.ParmJObj.GetInt("School_Id"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = classModule.GetLessonCommentList(query);
+            foreach (var item in list)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+            }
+            return ApiResult.Success(data: list);
+        }
+
+
+
+        /// <summary>
+        /// 新增/删除老师备案评论
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetLessonComment()
+        {
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_LessonComment_ViewModel>(RequestParm.Msg.ToString());
+            query.Group_Id = base.UserInfo.Group_Id;
+            query.CreateBy = base.UserInfo.Id;
+
+            query.CreateTime = System.DateTime.Now;
+
+            if (query.Score == 0)
+            {
+                return ApiResult.Failed("请选择评分");
+            }
+            if (string.IsNullOrWhiteSpace(query.Comment))
+            {
+                return ApiResult.Failed("评论内容不能为空");
+            }
+
+            bool flag = classModule.SetLessonComment(query);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
         #endregion
     }
 }

Edu.WebApi/Controllers/User/LoginController.cs

@@ -103,11 +103,11 @@ 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.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
                 {
                     MenuType = accountType
-                },out List<RB_Menu_ViewModel> userCenterList, postIds: model.Post_Id.ToString());
+                }, out List<RB_Menu_ViewModel> userCenterList, postIds: model.Post_Id.ToString());
                 //获取功能权限列表
                 var actionList = menuModule.GetPostMenuFunctionListModule(model.Post_Id.ToString());
                 //上传配置
@@ -115,7 +115,8 @@ namespace Edu.WebApi.Controllers.User
                 UserInfo obj = new UserInfo
                 {
                     Id = model.Id,
-                    AccountType=model.AccountType,
+                    AccountId = model.AccountId,
+                    AccountType = model.AccountType,
                     Group_Id = model.Group_Id,
                     GroupName = model.GroupName,
                     School_Id = model.School_Id,
@@ -124,7 +125,7 @@ namespace Edu.WebApi.Controllers.User
                     Token = token,
                     ErpToken = erpToken,
                     MenuList = treeList,
-                    UserCenterList= userCenterList,
+                    UserCenterList = userCenterList,
                     GroupLogo = model.GroupLogo,
                     UserIcon = model.UserIcon,
                     ApiRequestFromEnum = Common.Enum.ApiRequestFromEnum.WebAdmin,
@@ -132,8 +133,9 @@ namespace Edu.WebApi.Controllers.User
                     DeptName = model.DeptName,
                     PostId = model.Post_Id,
                     PostName = model.PostName,
-                    ActionMenuList= actionList?.Select(qitem => new {qitem.FunctionCode,qitem.FunctionName,qitem.MenuName,qitem.MenuUrl }),
-                    UploadConfig = new {
+                    ActionMenuList = actionList?.Select(qitem => new { qitem.FunctionCode, qitem.FunctionName, qitem.MenuName, qitem.MenuUrl }),
+                    UploadConfig = new
+                    {
                         uploadConfig?.Bucket,
                         uploadConfig?.StoreType,
                         uploadConfig?.Region,