页面修改

Edu.Common/Plugin/NPOIHelper.cs

@@ -610,17 +610,36 @@ namespace Edu.Common.Plugin
             {
                 using (FileStream fileStream = new FileStream(excelPath, FileMode.Open, FileAccess.Read))
                 {
-                    HSSFWorkbook workbook = new HSSFWorkbook(fileStream);
-                    HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(workbook);
-                    sheetCount = workbook.NumberOfSheets;
-                    for (int i = 0; i < sheetCount; ++i)
+                    string extFile = Path.GetExtension(excelPath).ToLower();
+                    IWorkbook workbook;
+                    if (extFile.Equals(".xls"))
                     {
-                        HSSFSheet sheet = workbook.GetSheetAt(i) as HSSFSheet;
-                        DataTable dt = ImportDataTable(sheet, 0, firstRowAsHeader);
-                        dt.TableName = workbook.GetSheetName(i);
-                        ds.Tables.Add(dt);
+                        workbook = new HSSFWorkbook(fileStream);
+                        HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(workbook);
+                        sheetCount = workbook.NumberOfSheets;
+                        for (int i = 0; i < sheetCount; ++i)
+                        {
+                            HSSFSheet sheet = workbook.GetSheetAt(i) as HSSFSheet;
+                            DataTable dt = ImportDataTable(sheet, 0, firstRowAsHeader);
+                            dt.TableName = workbook.GetSheetName(i);
+                            ds.Tables.Add(dt);
+                        }
+                        return ds;
+                    }
+                    else
+                    {
+                        workbook = new XSSFWorkbook(fileStream);
+                        XSSFFormulaEvaluator evaluator = new XSSFFormulaEvaluator(workbook);
+                        sheetCount = workbook.NumberOfSheets;
+                        for (int i = 0; i < sheetCount; ++i)
+                        {
+                            XSSFSheet sheet = workbook.GetSheetAt(i) as XSSFSheet;
+                            DataTable dt = ImportDataTable(sheet, 0, firstRowAsHeader);
+                            dt.TableName = workbook.GetSheetName(i);
+                            ds.Tables.Add(dt);
+                        }
+                        return ds;
                     }
-                    return ds;
                 }
             }
         }

Edu.Module.Course/CourseModule.cs

@@ -1103,6 +1103,8 @@ namespace Edu.Module.Course
                         continue;
                     }
                     List<RB_Course_Chapter_ViewModel> result = new List<RB_Course_Chapter_ViewModel>();
+                    //课程单词列表
+                    var courseWordsList = course_WordsRepository.GetCourseWordsListRepository(new RB_Course_Words_Extend() { CourseId = item.CourseId }).OrderBy(qitem=>qitem.ChapterId).ToList();
                     var chapterQuery = new RB_Course_Chapter_ViewModel() { CourseId = item.CourseId };
                     var sourceList = GetChapterListModule(chapterQuery);
                     var treeList= GetChapterTreeListModule(chapterQuery);
@@ -1111,6 +1113,7 @@ namespace Edu.Module.Course
                         foreach (var tItem in treeList)
                         {
                             var rootModel= sourceList.Where(qitem => qitem.ChapterId == tItem.ChapterId).FirstOrDefault();
+                           
                             rootModel.ChapterId = 0;
                             if (tItem.ChildList == null || (tItem.ChildList != null && tItem.ChildList.Count == 0))
                             {
@@ -1127,6 +1130,7 @@ namespace Edu.Module.Course
                                 rootModel2.StudyMinutes = 90;
                                 rootModel1.ChapterId = 0;
                                 result.Add(rootModel2);
+
                             }
                             else
                             {