Commit c22c784d authored by 黄奎's avatar 黄奎

页面修改

parent 5ebb8cc6
...@@ -184,6 +184,8 @@ namespace Edu.Common.Plugin ...@@ -184,6 +184,8 @@ namespace Edu.Common.Plugin
ms.Position = 0; ms.Position = 0;
return ms.ToArray(); return ms.ToArray();
} }
} }
/// <summary> /// <summary>
......
...@@ -3473,7 +3473,6 @@ namespace Edu.Module.Course ...@@ -3473,7 +3473,6 @@ namespace Edu.Module.Course
foreach (var item in orderList) foreach (var item in orderList)
{ {
List<object> ChapterList = new List<object>(); List<object> ChapterList = new List<object>();
var ogModel = ogList.Where(x => x.OrderId == item.OrderId).FirstOrDefault(); var ogModel = ogList.Where(x => x.OrderId == item.OrderId).FirstOrDefault();
var oguestModel = orderGuestList.Where(x => x.Id == ogModel.GuestId).FirstOrDefault(); var oguestModel = orderGuestList.Where(x => x.Id == ogModel.GuestId).FirstOrDefault();
...@@ -3554,8 +3553,8 @@ namespace Edu.Module.Course ...@@ -3554,8 +3553,8 @@ namespace Edu.Module.Course
item.CourseId, item.CourseId,
item.CourseName, item.CourseName,
item.ClassScrollType, item.ClassScrollType,
oguestModel.CourseChapterNo, CourseChapterNo= oguestModel?.CourseChapterNo??0,
oguestModel.TotalChapterNo, TotalChapterNo= oguestModel?.TotalChapterNo??0,
ChapterList ChapterList
}); });
} }
......
...@@ -1229,13 +1229,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1229,13 +1229,12 @@ namespace Edu.WebApi.Controllers.Course
int State = sObj.GetInt("State"); int State = sObj.GetInt("State");
if (State == 4) if (State == 4)
{ {
dataRow.ExcelRows.Add(new ExcelColumn(value: chapterName) ); dataRow.ExcelRows.Add(new ExcelColumn(value: chapterName) { } );
} }
else else
{ {
dataRow.ExcelRows.Add(new ExcelColumn(value: "【已上课】" + chapterName) { BgColorEnum= ColorEnum.DarkBlue}); dataRow.ExcelRows.Add(new ExcelColumn(value: "【已上课】" + chapterName));
} }
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment