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

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1707,7 +1707,10 @@ namespace Edu.WebApi.Controllers.Course
                 ExcelRows = new List<ExcelColumn>(30) {
                     new ExcelColumn(value:"订单号"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"下单日期"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                    new ExcelColumn(value:"业务员"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                    new ExcelColumn(value:"下单人"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                    new ExcelColumn(value:"市场人员"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                    new ExcelColumn(value:"课程顾问"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                    new ExcelColumn(value:"协助老师"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"班级"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"开班时间"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"课程"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
@@ -1768,7 +1771,10 @@ namespace Edu.WebApi.Controllers.Course
                         {
                             new ExcelColumn(value: item.OrderId.ToString()){ },
                             new ExcelColumn(value: item.CreateTime.ToString("yyyy-MM-dd HH:mm")){ },
-                            new ExcelColumn(value: item.EnterName){ },
+                            new ExcelColumn(value: (item.CreateBy > 0 ? UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "" : "")){ },
+                            new ExcelColumn(value: (item.EnterID > 0 ? UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "" : "")){ },
+                            new ExcelColumn(value: (item.CourseConsultantId > 0 ? UserReidsCache.GetUserLoginInfo(item.CourseConsultantId)?.AccountName ?? "" : "")){ },
+                            new ExcelColumn(value: (item.HelpEnterId > 0 ? UserReidsCache.GetUserLoginInfo(item.HelpEnterId)?.AccountName ?? "" : "")){ },
                             new ExcelColumn(value: item.ClassName){ },
                             new ExcelColumn(value: item.OpenTime.ToString("yyyy-MM-dd")){ },
                             new ExcelColumn(value: item.CourseName){ },
@@ -1803,6 +1809,9 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: list.Sum(x=>x.GuestNum).ToString()){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },