1111

Edu.Model/ViewModel/Course/RB_Course_Chapter_ViewModel.cs

@@ -44,5 +44,10 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public List<RB_Course_Words_Extend> WordsList { get; set; }
 
+        /// <summary>
+        /// 是否值查询根节点
+        /// </summary>
+        public int IsQRoot { get; set; }
+
     }
 }

Edu.Repository/Course/RB_Course_ChapterRepository.cs

@@ -56,6 +56,10 @@ namespace Edu.Repository.Course
                 {
                     builder.AppendFormat(" AND {0}='{1}' ", nameof(RB_Course_Chapter_ViewModel.ChapterNo), query.ChapterNo);
                 }
+                if (query.IsQRoot == 1)
+                {
+                    builder.AppendFormat(" AND {0}=0 ", nameof(RB_Course_Chapter_ViewModel.ParentId));
+                }
             }
             return Get<RB_Course_Chapter_ViewModel>(builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -691,11 +691,24 @@ namespace Edu.WebApi.Controllers.Course
         [HttpPost]
         public ApiResult GetChapterList()
         {
-            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Course_Chapter_ViewModel>(RequestParm.Msg.ToString());
+            var query = new RB_Course_Chapter_ViewModel()
+            {
+                CourseId=base.ParmJObj.GetInt("CourseId"),
+                IsQRoot =base.ParmJObj.GetInt("IsQRoot"),
+            };
+            if (query.CourseId <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请传递课程编号!");
+            }
             query.Group_Id = base.UserInfo.Group_Id;
-            query.School_Id = base.UserInfo.School_Id;
-            var list = courseModule.GetChapterListModule(query);
-            return ApiResult.Success(data: list);
+            var list = courseModule.GetChapterListModule(query).OrderBy(qitem => qitem.ChapterGradeNo).ToList();
+            return ApiResult.Success(data: list.Select(qitem => new
+            {
+                qitem.ChapterId,
+                qitem.ChapterNo,
+                qitem.ChapterGradeNo,
+                qitem.ChapterName,
+            }));
         }
 
         /// <summary>

Edu.WebApi/Controllers/Course/ScrollController.cs

@@ -1228,15 +1228,25 @@ namespace Edu.WebApi.Controllers.Course
                             var sObj = JObject.Parse(ChapterList[i].ToString()); ;
                             var chapterName = sObj.GetStringValue("ChapterName");
                             int State = sObj.GetInt("State");
-                            if (State == 4)
+                            if (State == 1)
+                            {
+                                str = chapterName;
+                                dataRow.ExcelRows.Add(new ExcelColumn(value: str) { FontColorEnum = ColorEnum.DarkBlue });
+                            }
+                            else if (State == 2)
+                            {
+                                str = "【补课】\r\n" + chapterName;
+                                dataRow.ExcelRows.Add(new ExcelColumn(value: str) { FontColorEnum = ColorEnum.Red });
+                            }
+                            else if (State == 3)
                             {
                                 str = "【缺课】\r\n" + chapterName;
                                 dataRow.ExcelRows.Add(new ExcelColumn(value: str) { FontColorEnum = ColorEnum.Red });
                             }
                             else
                             {
-                                str = "【已上课】\r\n" + chapterName;
-                                dataRow.ExcelRows.Add(new ExcelColumn(value: str) { FontColorEnum = ColorEnum.DarkBlue });
+                                str = chapterName;
+                                dataRow.ExcelRows.Add(new ExcelColumn(value: str) );
                             }
                         }
                         else