页面修改

Edu.Module.User/TeacherStaticModule.cs

@@ -5,6 +5,7 @@ using Edu.Repository.User;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 
 namespace Edu.Module.User
 {
@@ -2782,12 +2783,13 @@ namespace Edu.Module.User
             int Days = (endTime - date).Days;
             for (int i = 0; i < Days; i++)
             {
+                
                 var newDate = date.AddDays(i);
                 //获取老师迟到早退信息
                 checkList = Edu.ThirdCore.QYWinXin.QYWeiXinHelper.GetWeChatCheckList(workUserIds, newDate);
                 //获取老师与学员沟通次数
                 messageList = Edu.ThirdCore.QYWinXin.QYWeiXinHelper.GetWechatStudentStatic(workUserIds, newDate);
-                
+                Thread.Sleep(1 * 2000);
                 int times = 1;
                 int newDay = newDate.Day;
                 //本月最后一天

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -223,19 +223,30 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn("学生"){ CellWidth=15,Rowspan=2},
                         new ExcelColumn("电话"){ CellWidth=15,Rowspan=2},
                         new ExcelColumn("课程顾问"){ CellWidth=15,Rowspan=2},
-                        new ExcelColumn("协助老师"){ CellWidth=10,Rowspan=2},
+                        new ExcelColumn("班主任"){ CellWidth=10,Rowspan=2},
                         new ExcelColumn("合同时间"){ CellWidth=15,Rowspan=2},
                         new ExcelColumn("所报课程"){ CellWidth=20,Rowspan=2},
-                        new ExcelColumn("当前级别"){ CellWidth=15,Rowspan=2},
-                        new ExcelColumn("生日"){ CellWidth=15,Rowspan=2},
-                        new ExcelColumn("客户来源"){ CellWidth=15,Rowspan=2},
-                        new ExcelColumn("学习目的"){ CellWidth=15,Rowspan=2},
-                        new ExcelColumn("关联来源人"){ CellWidth=15,Rowspan=2},
-                        new ExcelColumn("收客渠道"){ CellWidth=15,Rowspan=2},
-                        new ExcelColumn("负责人"){ CellWidth=15,Rowspan=2},
-                        new ExcelColumn("合同状态"){ CellWidth=15,Rowspan=2},
+                       
                     }
                 };
+                header.ExcelRows.Add(new ExcelColumn("开课时间") { CellWidth = 15, Rowspan = 2 });
+                header.ExcelRows.Add(new ExcelColumn("结课时间") { CellWidth = 15, Rowspan = 2 });
+                header.ExcelRows.Add(new ExcelColumn("当前级别") { CellWidth = 15, Rowspan = 2 });
+                header.ExcelRows.Add(new ExcelColumn("生日") { CellWidth = 15, Rowspan = 2 });
+                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                {
+                    header.ExcelRows.Add(new ExcelColumn("客户来源") { CellWidth = 15, Rowspan = 2 });
+                }
+      
+                header.ExcelRows.Add(new ExcelColumn("学习目的") { CellWidth = 15, Rowspan = 2 });
+                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                {
+                    header.ExcelRows.Add(new ExcelColumn("关联来源人") { CellWidth = 15, Rowspan = 2 });
+                    header.ExcelRows.Add(new ExcelColumn("收客渠道") { CellWidth = 15, Rowspan = 2 });
+                }
+                header.ExcelRows.Add(new ExcelColumn("负责人") { CellWidth = 15, Rowspan = 2 });
+                header.ExcelRows.Add(new ExcelColumn("合同状态") { CellWidth = 15, Rowspan = 2 });
+
                 ExcelDataSource subHeader = new ExcelDataSource()
                 {
                     ExcelRows = new List<ExcelColumn>()
@@ -250,12 +261,24 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn(),
                         new ExcelColumn(),
                         new ExcelColumn(),
-                        new ExcelColumn(),
-                        new ExcelColumn(),
-                        new ExcelColumn(),
-                        new ExcelColumn(),
+                        
                     }
                 };
+                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                {
+                    subHeader.ExcelRows.Add(new ExcelColumn());
+                }
+
+                subHeader.ExcelRows.Add(new ExcelColumn());
+                if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                {
+                    subHeader.ExcelRows.Add(new ExcelColumn());
+                    subHeader.ExcelRows.Add(new ExcelColumn());
+                }
+                subHeader.ExcelRows.Add(new ExcelColumn());
+                subHeader.ExcelRows.Add(new ExcelColumn());
+
+
 
                 var rootObj = JObject.Parse(JsonHelper.Serialize(list));
                 int MaxMonth = rootObj.GetInt("MaxMonth");
@@ -302,12 +325,21 @@ namespace Edu.WebApi.Controllers.User
                         columns.Add(new ExcelColumn(teacherNamager));
                         columns.Add(new ExcelColumn(dObj.GetStringValue("ContractSTime")));
                         columns.Add(new ExcelColumn(dObj.GetStringValue("CourseName")));
+                        columns.Add(new ExcelColumn(dObj.GetStringValue("BeginClassDate")));
+                        columns.Add(new ExcelColumn(dObj.GetStringValue("GraduationTime")));
                         columns.Add(new ExcelColumn(dObj.GetStringValue("JapanBaseInfo")));
                         columns.Add(new ExcelColumn(dObj.GetStringValue("StuBirthStr")));
-                        columns.Add(new ExcelColumn(dObj.GetStringValue("CreateTypeName")));
+                        if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                        {
+                            columns.Add(new ExcelColumn(dObj.GetStringValue("CreateTypeName")));
+                        }
+                   
                         columns.Add(new ExcelColumn(dObj.GetStringValue("StuPurposeName")));
-                        columns.Add(new ExcelColumn(dObj.GetStringValue("StuSourceIdName")));
-                        columns.Add(new ExcelColumn(dObj.GetStringValue("StuChannelName")));
+                        if (base.UserInfo.AccountType != AccountTypeEnum.Teacher)
+                        {
+                            columns.Add(new ExcelColumn(dObj.GetStringValue("StuSourceIdName")));
+                            columns.Add(new ExcelColumn(dObj.GetStringValue("StuChannelName")));
+                        }
                         columns.Add(new ExcelColumn(dObj.GetStringValue("CreateByName")));
                         columns.Add(new ExcelColumn(dObj.GetStringValue("StuGuestStateName")));