页面修改

Edu.Model/ViewModel/Course/RB_Course_Chapter_ViewModel.cs

@@ -12,5 +12,10 @@ namespace Edu.Model.ViewModel.Course
         /// 课程编号【逗号分隔】
         /// </summary>
         public string CourseIds { get; set; }
+
+        /// <summary>
+        /// 序列号
+        /// </summary>
+        public int SerialNumber { get; set; }
     }
 }

Edu.Module.Course/CourseModule.cs

@@ -553,6 +553,60 @@ namespace Edu.Module.Course
             return flag;
         }
 
+        /// <summary>
+        /// 批量更新当前课时
+        /// </summary>
+        /// <param name="courseId"></param>
+        /// <returns></returns>
+        public virtual List<RB_Course_Chapter_ViewModel> BatchUpdateChapterCurrentHoursModule(int courseId)
+        {
+            List<RB_Course_Chapter_ViewModel> chapterList = new List<RB_Course_Chapter_ViewModel>();
+            List<ChapterTree_ViewModel> treeList = GetChapterTreeListModule(new RB_Course_Chapter_ViewModel() { CourseId = courseId });
+            CalcChapterClassHours(treeList, chapterList);
+            var resultList = chapterList;
+            if (resultList != null && resultList.Count > 0)
+            {
+                for (var i = 0; i < resultList.Count; i++)
+                {
+                    resultList[i].CurrentHours = resultList.Where(qitem => qitem.SerialNumber <= (i + 1)).Sum(qitem => qitem.StudyHours);
+                }
+            }
+            return resultList;
+        }
+
+        /// <summary>
+        /// 计算
+        /// </summary>
+        /// <param name="treeList"></param>
+        /// <param name="chapterList"></param>
+        public void CalcChapterClassHours(List<ChapterTree_ViewModel> treeList,List<RB_Course_Chapter_ViewModel> chapterList)
+        {
+            foreach (var item in treeList)
+            {
+                RB_Course_Chapter_ViewModel model = new RB_Course_Chapter_ViewModel()
+                {
+                     ChapterId=item.ChapterId,
+                     ChapterNo=item.ChapterNo,
+                     ChapterName=item.ChapterName,
+                     SerialNumber= chapterList.Count()+1,
+                };
+                if (item.ChildList != null && item.ChildList.Count > 0)
+                {
+                    model.StudyHours = 0;
+                }
+                else
+                {
+                    model.StudyHours = item.StudyHours;
+                }
+                chapterList.Add(model);
+                if (item.ChildList != null && item.ChildList.Count > 0)
+                {
+                    CalcChapterClassHours(item.ChildList, chapterList);
+                }
+            }
+        }
+
+
         /// <summary>
         /// 获取章节实体类
         /// </summary>

Edu.Repository/Course/RB_Course_ChapterRepository.cs

@@ -29,10 +29,12 @@ namespace Edu.Repository.Course
             WHERE 1=1 
             ");
             builder.AppendFormat(" AND {0}={1}", nameof(RB_Course_Chapter_ViewModel.Status), EnumHelper.ToInt(DateStateEnum.Normal));
-            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Course_Chapter_ViewModel.Group_Id), query.Group_Id);
-            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Course_Chapter_ViewModel.School_Id), query.School_Id);
             if (query != null)
             {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Course_Chapter_ViewModel.Group_Id), query.Group_Id);
+                }
                 if (query.CourseId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Course_Chapter_ViewModel.CourseId), query.CourseId);
@@ -42,7 +44,7 @@ namespace Edu.Repository.Course
                     builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Course_Chapter_ViewModel.CourseId), query.CourseIds);
                 }
             }
-            builder.AppendFormat(" ORDER BY {0}",nameof(RB_Course_Chapter_ViewModel.ChapterNo));
+            builder.AppendFormat(" ORDER BY {0} ",nameof(RB_Course_Chapter_ViewModel.ChapterNo));
             return Get<RB_Course_Chapter_ViewModel>(builder.ToString(), parameters).ToList();
         }
 

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -445,7 +445,6 @@ namespace Edu.WebApi.Controllers.Course
             extModel.UpdateTime = DateTime.Now;
             extModel.Group_Id = this.UserInfo.Group_Id;
             extModel.School_Id = this.UserInfo.School_Id;
-            
             bool flag = courseModule.SetChapterModule(extModel);
             return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed();
         }
@@ -464,6 +463,24 @@ namespace Edu.WebApi.Controllers.Course
             return ApiResult.Success(data: list);
         }
 
+        /// <summary>
+        /// 计算当前课时数
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult BatchUpdateChapterCurrentHours()
+        {
+            var CourseId = base.ParmJObj.GetInt("CourseId", 0);
+            var list = courseModule.BatchUpdateChapterCurrentHoursModule(CourseId);
+            return ApiResult.Success(data: list.Select(qitem => new
+            {
+                qitem.ChapterId,
+                qitem.ChapterNo,
+                qitem.ChapterName,
+                qitem.CurrentHours,
+            }));
+        }
+
         /// <summary>
         /// 获取章节树形列表
         /// </summary>