Commit b051f2bf authored by 黄奎's avatar 黄奎

页面修改

parent 7b941c3b
...@@ -164,25 +164,54 @@ namespace Edu.WebApi.Controllers.User ...@@ -164,25 +164,54 @@ namespace Edu.WebApi.Controllers.User
{ {
ExcelRows = new List<ExcelColumn>() ExcelRows = new List<ExcelColumn>()
{ {
new ExcelColumn("学生"){ CellWidth=15}, new ExcelColumn("学生"){ CellWidth=15,Rowspan=2},
new ExcelColumn("电话"){ CellWidth=15}, new ExcelColumn("电话"){ CellWidth=15,Rowspan=2},
new ExcelColumn("课程顾问"){ CellWidth=15}, new ExcelColumn("课程顾问"){ CellWidth=15,Rowspan=2},
new ExcelColumn("协助老师"){ CellWidth=10}, new ExcelColumn("协助老师"){ CellWidth=10,Rowspan=2},
new ExcelColumn("合同时间"){ CellWidth=15}, new ExcelColumn("合同时间"){ CellWidth=15,Rowspan=2},
new ExcelColumn("所报课程"){ CellWidth=15}, new ExcelColumn("所报课程"){ CellWidth=20,Rowspan=2},
new ExcelColumn("当前级别"){ CellWidth=20}, new ExcelColumn("当前级别"){ CellWidth=15,Rowspan=2},
new ExcelColumn("生日"){ CellWidth=20}, new ExcelColumn("生日"){ CellWidth=15,Rowspan=2},
new ExcelColumn("客户来源"){ CellWidth=20}, new ExcelColumn("客户来源"){ CellWidth=15,Rowspan=2},
new ExcelColumn("学习目的"){ CellWidth=15}, new ExcelColumn("学习目的"){ CellWidth=15,Rowspan=2},
new ExcelColumn("关联来源人"){ CellWidth=15}, new ExcelColumn("关联来源人"){ CellWidth=15,Rowspan=2},
new ExcelColumn("收客渠道"){ CellWidth=15}, new ExcelColumn("收客渠道"){ CellWidth=15,Rowspan=2},
new ExcelColumn("负责人"){ CellWidth=15}, new ExcelColumn("负责人"){ CellWidth=15,Rowspan=2},
new ExcelColumn("合同状态"){ CellWidth=15}, new ExcelColumn("合同状态"){ CellWidth=15,Rowspan=2},
}
};
ExcelDataSource subHeader = new ExcelDataSource()
{
ExcelRows = new List<ExcelColumn>()
{
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
new ExcelColumn(),
} }
}; };
slist.Add(header);
var rootObj = JObject.Parse(JsonHelper.Serialize(list)); var rootObj = JObject.Parse(JsonHelper.Serialize(list));
int MaxMonth = rootObj.GetInt("MaxMonth");
for (var i = 0; i < MaxMonth; i++)
{
header.ExcelRows.Add(new ExcelColumn(value: "第" + (i + 1) + "个月") { Colspan = 3 });
subHeader.ExcelRows.Add(new ExcelColumn(value: "月份/续费/转介") { CellWidth=25});
subHeader.ExcelRows.Add(new ExcelColumn(value: "教师跟踪时间及情况说明") { CellWidth = 30 });
subHeader.ExcelRows.Add(new ExcelColumn(value: "顾问跟踪时间及情况说明") { CellWidth = 30 });
}
slist.Add(header);
slist.Add(subHeader);
JArray arrayList = JArray.Parse(rootObj.GetStringValue("RList")); JArray arrayList = JArray.Parse(rootObj.GetStringValue("RList"));
if (arrayList != null && arrayList.Count > 0) if (arrayList != null && arrayList.Count > 0)
...@@ -225,6 +254,35 @@ namespace Edu.WebApi.Controllers.User ...@@ -225,6 +254,35 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("StuChannelName"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StuChannelName")));
columns.Add(new ExcelColumn(dObj.GetStringValue("CreateByName"))); columns.Add(new ExcelColumn(dObj.GetStringValue("CreateByName")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StuGuestStateName"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StuGuestStateName")));
JArray monthArray = JArray.Parse(dObj.GetStringValue("MonthList"));
if (monthArray != null && monthArray.Count > 0)
{
foreach (var mItem in monthArray)
{
JObject mObj = JObject.Parse(JsonHelper.Serialize(mItem));
int IsRenew = mObj.GetInt("IsRenew");
int IntroductionNum = mObj.GetInt("IntroductionNum");
string columns1 = mObj.GetStringValue("Month") + "/" + (IsRenew == 1 ? "是" : "否") + "/" + IntroductionNum;
columns.Add(new ExcelColumn(columns1));
string TeacherTime = mObj.GetStringValue("TeacherTime");
string Teacher = mObj.GetStringValue("Teacher");
string columns2 = TeacherTime + "-" + Teacher;
columns.Add(new ExcelColumn(columns2));
string ConsultantTime = mObj.GetStringValue("ConsultantTime");
string Consultant = mObj.GetStringValue("Consultant");
string columns3 = ConsultantTime;
if (!string.IsNullOrEmpty(Consultant))
{
columns3 += "\r\n" + Common.Plugin.StringHelper.AppHtmlFilterr(Consultant);
}
columns.Add(new ExcelColumn(columns3));
}
}
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
......
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