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

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

@@ -334,7 +334,7 @@ namespace Edu.Module.Course
                 {
                     {nameof(RB_Goods.GoodsStatus),2 },
                 };
-                flag = mallGoodsRepository.Update(fileds, new WhereHelper(nameof(RB_Goods.Id), model.MallGoodsId));
+                mallGoodsRepository.Update(fileds, new WhereHelper(nameof(RB_Goods.Id), model.MallGoodsId));
             }
             return flag;
         }
@@ -1098,11 +1098,13 @@ namespace Edu.Module.Course
             {
                 foreach (var item in courseList)
                 {
-                    //if (item.CourseId != 97)
-                    //{
-                    //    continue;
-                    //}
+                    if (item.CourseId != 215)
+                    {
+                        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
                             {

Edu.Module.Customer/MarketConsultantModule.cs

@@ -1239,12 +1239,18 @@ namespace Edu.Module.Customer
                         foreach (var subItem in sourceIdList)
                         {
                             var tempCusList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput && qitem.StuSourceId == subItem.StuSourceId)?.ToList();
+                            var tempCustomer = customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId);
+                            string channelName = tempCustomer?.CustomerName ?? "";
+                            if (!string.IsNullOrEmpty(tempCustomer?.CategoryName))
+                            {
+                                channelName += string.Format("（{0}）", tempCustomer?.CategoryName);
+                            }
                             //企业同行
                             if (sItem.CustomerType ==  Common.Enum.Customer.CatetoryTypeEnum.Company)
                             {
                                 customerDataList.Add(new MarketChannelStaticModel()
                                 {
-                                    ChannelName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId)?.CustomerName ?? "",
+                                    ChannelName = channelName,
                                     ChannelId = subItem.StuSourceId,
                                     ClueCount = tempCusList?.Count() ?? 0,
                                     VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount) ?? 0,
@@ -1257,7 +1263,7 @@ namespace Edu.Module.Customer
                             {
                                 schoolDataList.Add(new MarketChannelStaticModel()
                                 {
-                                    ChannelName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId)?.CustomerName ?? "",
+                                    ChannelName = channelName,
                                     ChannelId = subItem.StuSourceId,
                                     ClueCount = tempCusList?.Count() ?? 0,
                                     VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount) ?? 0,

Edu.Repository/User/RB_StudentRepository.cs

@@ -1072,7 +1072,7 @@ WHERE 1=1
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.StuId,A.CreateBy,A.StuChannel,A.CreateType,IFNULL(B.VisitCount,0) AS VisitCount,IFNULL(C.CourseOrderCount,0) AS OrderCount,IFNULL(c.Income,0) AS OrderInCome
-      ,A.CustomerId,A.StuSourceId,IFNULL(D.CustomerType,0) AS CustomerType
+      ,A.CustomerId,A.StuSourceId,IFNULL(D.CustomerType,0) AS CustomerType,IFNULL(D.CategoryId,0) AS CategoryId
 FROM RB_Student AS A 
      LEFT JOIN(SELECT StuId,Count(1) AS VisitCount FROM rb_student_visit WHERE Status=0 GROUP BY StuId) AS B ON A.StuId=B.StuId
      LEFT JOIN(SELECT og.Student_Id,COUNT(1) AS CourseOrderCount,SUM(o.Income) AS Income FROM  rb_student_orderguest AS og INNER JOIN rb_order AS o ON og.OrderId=o.OrderId WHERE O.OrderState NOT IN(3,4) GROUP BY og.Student_Id ) AS C ON A.StuId=C.Student_Id

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -699,7 +699,7 @@ LEFT JOIN rb_education_contract ec on ec.GuestId = og.GuestId";
             }
             if (demodel.ConsultantId > 0)
             {
-                where += $@" AND s.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId ={demodel.ConsultantId} AND `Status`=0)";
+                where += $@" AND s.StuId IN (SELECT StuId FROM rb_student_assist WHERE  AssistType=2 AND AssistId ={demodel.ConsultantId} AND `Status`=0)";
             }
             if (!string.IsNullOrEmpty(demodel.SFTime) && !string.IsNullOrEmpty(demodel.EFTime))
             {