Skip to content

E
Education
Commit 7bcf67ce authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 7d354d87
Hide whitespace changes
Inline Side-by-side
Showing with 286 additions and 337 deletions
Edu.Model/Entity/Grade/RB_Class.cs
View file @ 7bcf67ce
...@@ -12,205 +12,206 @@ namespace Edu.Model.Entity.Grade ...@@ -12,205 +12,206 @@ namespace Edu.Model.Entity.Grade
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_Class public class RB_Class
{ {
/// <summary> /// <summary>
/// 主键(班级ID) /// 主键(班级ID)
/// </summary> /// </summary>
public int ClassId { get; set; } public int ClassId { get; set; }
/// <summary> /// <summary>
/// 班级名称 /// 班级名称
/// </summary> /// </summary>
public string ClassName { get; set; } public string ClassName { get; set; }
/// <summary> /// <summary>
/// 课程Id /// 课程Id
/// </summary> /// </summary>
public int CouseId { get; set; } public int CouseId { get; set; }
/// <summary> /// <summary>
/// 讲师Id /// 讲师Id
/// </summary> /// </summary>
public int Teacher_Id { get; set; } public int Teacher_Id { get; set; }
/// <summary> /// <summary>
/// 助教Id /// 助教Id
/// </summary> /// </summary>
public int Assist_Id { get; set; } public int Assist_Id { get; set; }
/// <summary> /// <summary>
/// 集团编号 /// 集团编号
/// </summary> /// </summary>
public int Group_Id { get; set; } public int Group_Id { get; set; }
/// <summary> /// <summary>
/// 校区默认值 /// 校区默认值
/// </summary> /// </summary>
private int defaultSId = -1; private int defaultSId = -1;
/// <summary> /// <summary>
/// 学校编号 /// 学校编号
/// </summary> /// </summary>
public int School_Id { public int School_Id
{
get { return defaultSId; } get { return defaultSId; }
set { defaultSId = value; } set { defaultSId = value; }
} }
/// <summary> /// <summary>
/// 创建人 /// 创建人
/// </summary> /// </summary>
public int CreateBy { get; set; } public int CreateBy { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 修改人 /// 修改人
/// </summary> /// </summary>
public int UpdateBy { get; set; } public int UpdateBy { get; set; }
/// <summary> /// <summary>
/// 更新时间 /// 更新时间
/// </summary> /// </summary>
public DateTime UpdateTime { get; set; } public DateTime UpdateTime { get; set; }
/// <summary> /// <summary>
/// 删除状态(0-正常,1-禁用) /// 删除状态(0-正常,1-禁用)
/// </summary> /// </summary>
public DateStateEnum Status { get; set; } public DateStateEnum Status { get; set; }
/// <summary> /// <summary>
/// 招生人数 /// 招生人数
/// </summary> /// </summary>
public int ClassPersion { get; set; } public int ClassPersion { get; set; }
/// <summary> /// <summary>
/// 开班时间 /// 开班时间
/// </summary> /// </summary>
public DateTime OpenTime { get; set; } public DateTime OpenTime { get; set; }
/// <summary> /// <summary>
/// 截止报名时间 /// 截止报名时间
/// </summary> /// </summary>
public DateTime? EndOrderTime { get; set; } public DateTime? EndOrderTime { get; set; }
/// <summary> /// <summary>
/// 原价 /// 原价
/// </summary> /// </summary>
public decimal OriginalPrice { get; set; } public decimal OriginalPrice { get; set; }
/// <summary> /// <summary>
/// 售价 /// 售价
/// </summary> /// </summary>
public decimal SellPrice { get; set; } public decimal SellPrice { get; set; }
/// <summary> /// <summary>
/// 是否阶梯价(1-是) /// 是否阶梯价(1-是)
/// </summary> /// </summary>
public int IsStepPrice { get; set; } public int IsStepPrice { get; set; }
/// <summary> /// <summary>
/// 教室编号 /// 教室编号
/// </summary> /// </summary>
public int ClassRoomId { get; set; } public int ClassRoomId { get; set; }
/// <summary> /// <summary>
/// 是否开启提成设置(1-是) /// 是否开启提成设置(1-是)
/// </summary> /// </summary>
public int IsOpenCommission { get; set; } public int IsOpenCommission { get; set; }
/// <summary> /// <summary>
/// 提成类型(1-人头，2-百分比） /// 提成类型(1-人头，2-百分比）
/// </summary> /// </summary>
public int CommissionType { get; set; } public int CommissionType { get; set; }
/// <summary> /// <summary>
/// 提成值 /// 提成值
/// </summary> /// </summary>
public decimal CommissionValue { get; set; } public decimal CommissionValue { get; set; }
/// <summary> /// <summary>
/// 课时 /// 课时
/// </summary> /// </summary>
public int ClassHours { get; set; } public int ClassHours { get; set; }
/// <summary> /// <summary>
/// 排课方式(1-周，2-月，3-固定日期，4-约课) /// 排课方式(1-周，2-月，3-固定日期，4-约课)
/// </summary> /// </summary>
public ClassStyleEnum ClassStyle { get; set; } public ClassStyleEnum ClassStyle { get; set; }
/// <summary> /// <summary>
/// 班级状态 /// 班级状态
/// </summary> /// </summary>
public ClassStatusEnum ClassStatus { get; set; } public ClassStatusEnum ClassStatus { get; set; }
/// <summary> /// <summary>
/// 对内备注 /// 对内备注
/// </summary> /// </summary>
public string InnerRemark { get; set; } public string InnerRemark { get; set; }
/// <summary> /// <summary>
/// 对外备注 /// 对外备注
/// </summary> /// </summary>
public string OutRemark { get; set; } public string OutRemark { get; set; }
/// <summary> /// <summary>
/// 完成进度 /// 完成进度
/// </summary> /// </summary>
public int CompleteProgress { get; set; } public int CompleteProgress { get; set; }
/// <summary> /// <summary>
/// 班级类型(1-学生班，2-社会班) /// 班级类型(1-学生班，2-社会班)
/// </summary> /// </summary>
public int ClassType { get; set; } public int ClassType { get; set; }
/// <summary> /// <summary>
/// 默认时间字符串JSON /// 默认时间字符串JSON
/// </summary> /// </summary>
public string DefaultTimeJson { get; set; } public string DefaultTimeJson { get; set; }
/// <summary> /// <summary>
/// 默认选中的日期、周 /// 默认选中的日期、周
/// </summary> /// </summary>
public string DateJson { get; set; } public string DateJson { get; set; }
/// <summary> /// <summary>
/// 结课日期 /// 结课日期
/// </summary> /// </summary>
public DateTime EndClassDate { get; set; } public DateTime EndClassDate { get; set; }
/// <summary> /// <summary>
/// App是否可预约 /// App是否可预约
/// </summary> /// </summary>
public int IsSubscribe { get; set; } public int IsSubscribe { get; set; }
/// <summary> /// <summary>
/// 是否可抵扣 /// 是否可抵扣
/// </summary> /// </summary>
public int IsDeduction { get; set; } public int IsDeduction { get; set; }
/// <summary> /// <summary>
/// 点数 /// 点数
/// </summary> /// </summary>
public int Point { get; set; } public int Point { get; set; }
/// <summary> /// <summary>
/// 分类类型 /// 分类类型
/// </summary> /// </summary>
public CourseClassTypeEnum? CourseClassType { get; set; } public CourseClassTypeEnum? CourseClassType { get; set; }
/// <summary> /// <summary>
/// 上课人数 /// 上课人数
/// </summary> /// </summary>
public StudentNumTypeEnum? StudentNumType { get; set; } public StudentNumTypeEnum? StudentNumType { get; set; }
/// <summary> /// <summary>
/// 课时分钟数 /// 课时分钟数
/// </summary> /// </summary>
public int ClassHourMinute { get; set; } public int ClassHourMinute { get; set; }
/// <summary> /// <summary>
/// 班级编号 /// 班级编号
...@@ -222,17 +223,16 @@ namespace Edu.Model.Entity.Grade ...@@ -222,17 +223,16 @@ namespace Edu.Model.Entity.Grade
/// </summary> /// </summary>
public int ClassLetterNum { get; set; } public int ClassLetterNum { get; set; }
private int scrollType = 1;//默认正常班 private int scrollType = 1;//默认正常班
/// <summary> /// <summary>
/// 开班类型 1正常班 2滚动班 /// 开班类型 1正常班 2滚动班
/// </summary> /// </summary>
public int ClassScrollType { get => scrollType; set => scrollType = value; } public int ClassScrollType { get => scrollType; set => scrollType = value; }
/// <summary>
/// 滚动开班月份
/// </summary>
public string ScrollMonth { get; set; }
} /// <summary>
/// 滚动开班月份
/// </summary>
public string ScrollMonth { get; set; }
}
} }
Edu.WebApi/Controllers/User/TeacherStaticController.cs
View file @ 7bcf67ce
...@@ -4,13 +4,10 @@ using Edu.Model.ViewModel.User; ...@@ -4,13 +4,10 @@ using Edu.Model.ViewModel.User;
using Edu.Module.User; using Edu.Module.User;
using Edu.WebApi.Filter; using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Edu.WebApi.Controllers.User namespace Edu.WebApi.Controllers.User
{ {
...@@ -70,40 +67,28 @@ namespace Edu.WebApi.Controllers.User ...@@ -70,40 +67,28 @@ namespace Edu.WebApi.Controllers.User
{ {
ExcelRows = new List<ExcelColumn>() ExcelRows = new List<ExcelColumn>()
{ {
new ExcelColumn("日期"){ CellWidth=15}, new ExcelColumn("日期"){ CellWidth=15},
new ExcelColumn("推送人数"){ CellWidth=15}, new ExcelColumn("学生人数"){ CellWidth=15},
new ExcelColumn("新客户"){ CellWidth=15}, new ExcelColumn("上课时数"){ CellWidth=15},
new ExcelColumn("初步沟通(二次沟通)"){ CellWidth=10}, new ExcelColumn("线上与学生互动数"){ CellWidth=10},
new ExcelColumn("预约试听(已到店,已试听)"){ CellWidth=15}, new ExcelColumn("续约(含留学)"){ CellWidth=15},
new ExcelColumn("待联系"){ CellWidth=15}, new ExcelColumn("学生升级"){ CellWidth=15},
new ExcelColumn("日语语培"){ CellWidth=15}, new ExcelColumn("转介绍"){ CellWidth=15},
new ExcelColumn("韩国语培"){ CellWidth=15}, new ExcelColumn("试讲(次)"){ CellWidth=15},
new ExcelColumn("法语语培"){ CellWidth=15}, new ExcelColumn("学生旷课(次)"){ CellWidth=15},
new ExcelColumn("日本留学"){ CellWidth=15}, new ExcelColumn("学生退课(次)"){ CellWidth=15},
new ExcelColumn("韩国留学"){ CellWidth=15}, new ExcelColumn("学生投诉(次)"){ CellWidth=15},
new ExcelColumn("英港澳留学"){ CellWidth=15}, new ExcelColumn("老师迟到早退(次)"){ CellWidth=15},
new ExcelColumn("美国留学"){ CellWidth=15}, new ExcelColumn("N5课程时数"){ CellWidth=15},
new ExcelColumn("新加坡留学"){ CellWidth=15}, new ExcelColumn("N4课程时数"){ CellWidth=15},
new ExcelColumn("澳新留学"){ CellWidth=15}, new ExcelColumn("N3课程时数"){ CellWidth=15},
new ExcelColumn("其他"){ CellWidth=15}, new ExcelColumn("N2课程时数"){ CellWidth=15},
new ExcelColumn("A类客户"){ CellWidth=15}, new ExcelColumn("N1课程时数"){ CellWidth=15},
new ExcelColumn("B类客户"){ CellWidth=15}, new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
new ExcelColumn("C类客户"){ CellWidth=15}, new ExcelColumn("学生小程序刷题时间"){ CellWidth=15},
new ExcelColumn("D类客户"){ CellWidth=15}, new ExcelColumn("总分数"){ CellWidth=15},
new ExcelColumn("同行介绍"){ CellWidth=15}, new ExcelColumn("所有老师平均分数"){ CellWidth=15},
new ExcelColumn("直客"){ CellWidth=15}, new ExcelColumn("分数差距"){ CellWidth=15},
new ExcelColumn("学员转介绍"){ CellWidth=15},
new ExcelColumn("内部介绍"){ CellWidth=15},
new ExcelColumn("无效"){ CellWidth=15},
new ExcelColumn("疑似"){ CellWidth=15},
new ExcelColumn("意向"){ CellWidth=15},
new ExcelColumn("近期可邀约"){ CellWidth=15},
new ExcelColumn("谈判"){ CellWidth=15},
new ExcelColumn("签约.成交.续费"){ CellWidth=15},
new ExcelColumn("语培签约金额"){ CellWidth=15},
new ExcelColumn("语培签约待收金额"){ CellWidth=15},
new ExcelColumn("留学签约金额"){ CellWidth=15},
new ExcelColumn("留学签约待收金额"){ CellWidth=15},
} }
}; };
slist.Add(header); slist.Add(header);
...@@ -114,39 +99,27 @@ namespace Edu.WebApi.Controllers.User ...@@ -114,39 +99,27 @@ namespace Edu.WebApi.Controllers.User
{ {
new ExcelColumn(dObj.GetStringValue("DateStr")) new ExcelColumn(dObj.GetStringValue("DateStr"))
}; };
columns.Add(new ExcelColumn(dObj.GetStringValue("PushCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("NewCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("AttendClassHourScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("CommunicationCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TrialLessonCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("NotContacted"))); columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("JPCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("KRCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TrialSpeakScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("FRCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("JPStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("KRStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("YGAStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("USStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SGStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("AXStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OtherCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassACount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassBCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassCCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppTimeScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassDCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TotalScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("CustomerCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("AvgScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("B2CCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ScoreGap")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TransCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("InnerCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SuspectedCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("IntentionCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("InvitationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
...@@ -158,7 +131,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -158,7 +131,7 @@ namespace Edu.WebApi.Controllers.User
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DownLoadStudentStatic"); LogHelper.Write(ex, "DownLoadTeacherDay");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist); var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName); return File(byteData1, "application/octet-stream", excelName);
} }
...@@ -203,39 +176,27 @@ namespace Edu.WebApi.Controllers.User ...@@ -203,39 +176,27 @@ namespace Edu.WebApi.Controllers.User
ExcelRows = new List<ExcelColumn>() ExcelRows = new List<ExcelColumn>()
{ {
new ExcelColumn("日期"){ CellWidth=15}, new ExcelColumn("日期"){ CellWidth=15},
new ExcelColumn("推送人数"){ CellWidth=15}, new ExcelColumn("学生人数"){ CellWidth=15},
new ExcelColumn("新客户"){ CellWidth=15}, new ExcelColumn("上课时数"){ CellWidth=15},
new ExcelColumn("初步沟通(二次沟通)"){ CellWidth=10}, new ExcelColumn("线上与学生互动数"){ CellWidth=10},
new ExcelColumn("预约试听(已到店,已试听)"){ CellWidth=15}, new ExcelColumn("续约(含留学)"){ CellWidth=15},
new ExcelColumn("待联系"){ CellWidth=15}, new ExcelColumn("学生升级"){ CellWidth=15},
new ExcelColumn("日语语培"){ CellWidth=15}, new ExcelColumn("转介绍"){ CellWidth=15},
new ExcelColumn("韩国语培"){ CellWidth=15}, new ExcelColumn("试讲(次)"){ CellWidth=15},
new ExcelColumn("法语语培"){ CellWidth=15}, new ExcelColumn("学生旷课(次)"){ CellWidth=15},
new ExcelColumn("日本留学"){ CellWidth=15}, new ExcelColumn("学生退课(次)"){ CellWidth=15},
new ExcelColumn("韩国留学"){ CellWidth=15}, new ExcelColumn("学生投诉(次)"){ CellWidth=15},
new ExcelColumn("英港澳留学"){ CellWidth=15}, new ExcelColumn("老师迟到早退(次)"){ CellWidth=15},
new ExcelColumn("美国留学"){ CellWidth=15}, new ExcelColumn("N5课程时数"){ CellWidth=15},
new ExcelColumn("新加坡留学"){ CellWidth=15}, new ExcelColumn("N4课程时数"){ CellWidth=15},
new ExcelColumn("澳新留学"){ CellWidth=15}, new ExcelColumn("N3课程时数"){ CellWidth=15},
new ExcelColumn("其他"){ CellWidth=15}, new ExcelColumn("N2课程时数"){ CellWidth=15},
new ExcelColumn("A类客户"){ CellWidth=15}, new ExcelColumn("N1课程时数"){ CellWidth=15},
new ExcelColumn("B类客户"){ CellWidth=15}, new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
new ExcelColumn("C类客户"){ CellWidth=15}, new ExcelColumn("学生小程序刷题时间"){ CellWidth=15},
new ExcelColumn("D类客户"){ CellWidth=15}, new ExcelColumn("总分数"){ CellWidth=15},
new ExcelColumn("同行介绍"){ CellWidth=15}, new ExcelColumn("所有老师平均分数"){ CellWidth=15},
new ExcelColumn("直客"){ CellWidth=15}, new ExcelColumn("分数差距"){ CellWidth=15},
new ExcelColumn("学员转介绍"){ CellWidth=15},
new ExcelColumn("内部介绍"){ CellWidth=15},
new ExcelColumn("无效"){ CellWidth=15},
new ExcelColumn("疑似"){ CellWidth=15},
new ExcelColumn("意向"){ CellWidth=15},
new ExcelColumn("近期可邀约"){ CellWidth=15},
new ExcelColumn("谈判"){ CellWidth=15},
new ExcelColumn("签约.成交.续费"){ CellWidth=15},
new ExcelColumn("语培签约金额"){ CellWidth=15},
new ExcelColumn("语培签约待收金额"){ CellWidth=15},
new ExcelColumn("留学签约金额"){ CellWidth=15},
new ExcelColumn("留学签约待收金额"){ CellWidth=15},
} }
}; };
slist.Add(header); slist.Add(header);
...@@ -246,39 +207,27 @@ namespace Edu.WebApi.Controllers.User ...@@ -246,39 +207,27 @@ namespace Edu.WebApi.Controllers.User
{ {
new ExcelColumn(dObj.GetStringValue("DateStr")) new ExcelColumn(dObj.GetStringValue("DateStr"))
}; };
columns.Add(new ExcelColumn(dObj.GetStringValue("PushCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("NewCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("AttendClassHourScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("CommunicationCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TrialLessonCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("NotContacted"))); columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("JPCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("KRCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TrialSpeakScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("FRCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("JPStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("KRStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("YGAStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("USStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SGStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("AXStudyCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OtherCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassACount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassBCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassCCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppTimeScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassDCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TotalScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("CustomerCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("AvgScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("B2CCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ScoreGap")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TransCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("InnerCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SuspectedCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("IntentionCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("InvitationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
...@@ -290,7 +239,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -290,7 +239,7 @@ namespace Edu.WebApi.Controllers.User
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DownLoadStudentStaticMonth"); LogHelper.Write(ex, "DownLoadTeacherMonth");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist); var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName); return File(byteData1, "application/octet-stream", excelName);
} }
...@@ -381,7 +330,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -381,7 +330,7 @@ namespace Edu.WebApi.Controllers.User
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DownLoadStudentStaticMonthRate"); LogHelper.Write(ex, "DownLoadTeacherStaticMonthRate");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist); var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName); return File(byteData1, "application/octet-stream", excelName);
} }
...@@ -452,7 +401,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -452,7 +401,7 @@ namespace Edu.WebApi.Controllers.User
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DownLoadStudentStaticYear"); LogHelper.Write(ex, "DownLoadTeacherStaticYear");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist); var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName); return File(byteData1, "application/octet-stream", excelName);
} }
...@@ -480,7 +429,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -480,7 +429,7 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Obsolete] [Obsolete]
public FileContentResult DownLoadStudentCompanyYearRate() public FileContentResult DownLoadTeacherStaticYearRate()
{ {
var query = new RB_Teacher_Static_Extend() var query = new RB_Teacher_Static_Extend()
{ {
...@@ -523,7 +472,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -523,7 +472,7 @@ namespace Edu.WebApi.Controllers.User
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DownLoadStudentStaticYearRate"); LogHelper.Write(ex, "DownLoadTeacherStaticYearRate");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist); var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName); return File(byteData1, "application/octet-stream", excelName);
} }
......
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