Skip to content

E
Education
Commit 51cfab61 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents ce657c85 e769bf9f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
Edu.WebApi/Controllers/Course/TeacherClassController.cs
View file @ 51cfab61
...@@ -828,22 +828,19 @@ namespace Edu.WebApi.Controllers.Course ...@@ -828,22 +828,19 @@ namespace Edu.WebApi.Controllers.Course
var tempChapter =new RB_Course_Chapter_ViewModel(); var tempChapter =new RB_Course_Chapter_ViewModel();
if (itemGuest.OrderCourseList != null && itemGuest.OrderCourseList.Count > 0) if (itemGuest.OrderCourseList != null && itemGuest.OrderCourseList.Count > 0)
{ {
tempChapter = chatperList.FirstOrDefault(qitem => itemGuest.OrderCourseList.Any(sItem => sItem.CourseId == qitem.CourseId) && qitem.CourseRate == itemGuest.CourseGradeId && qitem.ChapterId == itemGuest.CourseGradeNo) ?? new RB_Course_Chapter_ViewModel(); tempChapter = chatperList.FirstOrDefault(qitem => itemGuest.OrderCourseList.Any(sItem => sItem.CourseId == qitem.CourseId) && qitem.CourseRate == itemGuest.CourseGradeId && qitem.ChapterNo == itemGuest.CourseGradeNo.ToString()) ?? new RB_Course_Chapter_ViewModel();
} }
else else
{ {
tempChapter = chatperList.FirstOrDefault(qitem => qitem.CourseId == itemGuest.LearnCourseId && qitem.CourseRate == itemGuest.CourseGradeId && qitem.ChapterId == itemGuest.CourseGradeNo) ?? new RB_Course_Chapter_ViewModel(); tempChapter = chatperList.FirstOrDefault(qitem => qitem.CourseId == itemGuest.LearnCourseId && qitem.ChapterNo == itemGuest.CourseGradeNo.ToString()) ?? new RB_Course_Chapter_ViewModel();
} }
string chapterName = itemGuest.CourseName + "-" + itemGuest.CourseGradeNo; string chapterName = itemGuest.CourseName + "-" + itemGuest.CourseGradeNo;
if (tempChapter != null && tempChapter.ChapterId > 0) if (tempChapter != null && tempChapter.ChapterId > 0)
{ {
chapterName = tempChapter.CourseRate.ToName() + "-" + tempChapter.ChapterName; chapterName = tempChapter.ChapterName;
}
else
{
string XX = "";
} }
excelColumns.Add(new ExcelColumn(value: chapterName) { CellWidth = 50, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }); excelColumns.Add(new ExcelColumn(value: chapterName) { CellWidth = 50, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
ExcelDataSource rowGuest = new ExcelDataSource() ExcelDataSource rowGuest = new ExcelDataSource()
{ {
......
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