Skip to content

E
Education
Commit 4a800d17 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent c5c1d9ef
Show whitespace changes
Inline Side-by-side
Showing with 388 additions and 64 deletions
Edu.Model/Entity/User/RB_Student_Static.cs
View file @ 4a800d17
......@@ -48,54 +48,54 @@ namespace Edu.Model.Entity.User
public decimal NotContacted { get; set; }
/// <summary>
/// 日本语培订单
/// 日本语培
/// </summary>
public decimal JPOrder { get; set; }
public decimal JPCount { get; set; }
/// <summary>
/// 韩国语培订单
/// 韩国语培
/// </summary>
public decimal KROrder { get; set; }
public decimal KRCount { get; set; }
/// <summary>
/// 法国语培订单
/// 法国语培
/// </summary>
public decimal FROrder { get; set; }
public decimal FRCount { get; set; }
/// <summary>
/// 日本留学
/// </summary>
public decimal JPStudyOrder { get; set; }
public decimal JPStudyCount { get; set; }
/// <summary>
/// 韩国留学
/// </summary>
public decimal KRStudyOrder { get; set; }
public decimal KRStudyCount { get; set; }
/// <summary>
/// 英港澳留学
/// </summary>
public decimal YGAStudyOrder { get; set; }
public decimal YGAStudyCount { get; set; }
/// <summary>
/// 美国留学
/// </summary>
public decimal USStudyOrder { get; set; }
public decimal USStudyCount { get; set; }
/// <summary>
/// 新加坡留学
/// </summary>
public decimal SGStudyOrder { get; set; }
public decimal SGStudyCount { get; set; }
/// <summary>
/// 澳新留学
/// </summary>
public decimal AXStudyOrder { get; set; }
public decimal AXStudyCount { get; set; }
/// <summary>
/// 其他留学
/// 其他
/// </summary>
public decimal OtherStudyOrder { get; set; }
public decimal OtherCount { get; set; }
/// <summary>
/// A类客户
......@@ -153,7 +153,7 @@ namespace Edu.Model.Entity.User
public decimal IntentionCount { get; set; }
/// <summary>
/// 近期课邀约
/// 近期可邀约
/// </summary>
public decimal InvitationCount { get; set; }
......@@ -188,7 +188,7 @@ namespace Edu.Model.Entity.User
public int MonthStr { get; set; }
/// <summary>
/// 次
/// 次(0-上旬，1-中旬，2-下旬)
/// </summary>
public int Times { get; set; }
......
Edu.Model/ViewModel/User/RB_Student_Static_Extend.cs
View file @ 4a800d17
......@@ -11,6 +11,15 @@ namespace Edu.Model.ViewModel.User
/// </summary>
public class RB_Student_Static_Extend : RB_Student_Static
{
/// <summary>
/// 日期字符串
/// </summary>
public string DateStr
{
get
{
return Common.ConvertHelper.FormatDate2(this.Date);
}
}
}
}
Edu.Module.Course/ClassModule.cs
View file @ 4a800d17
......@@ -5863,7 +5863,7 @@ namespace Edu.Module.Course
var firstModel = tempPlanList.FirstOrDefault();
foreach (var subItem in tempPlanList)
{
if (subItem.ClassTimeId != null && subItem.ClassTimeId > 0)
if (subItem.ClassTimeId > 0)
{
}
......
Edu.Module.User/StudentStatModule.cs
View file @ 4a800d17
......@@ -4,6 +4,7 @@ using Edu.Common.Enum.System;
using Edu.Common.Enum.User;
using Edu.Common.Plugin;
using Edu.Model.CacheModel;
using Edu.Model.Entity.User;
using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.Mall;
using Edu.Model.ViewModel.User;
......@@ -391,6 +392,251 @@ namespace Edu.Module.User
return list;
}
/// <summary>
/// 生成每天数据
/// </summary>
/// <param name="user">当前操作用户</param>
/// <param name="StartTime">开始时间</param>
/// <param name="EndTime">结束时间</param>
/// <returns></returns>
public bool CreateStudentStaticModule(UserInfo user,string StartTime,string EndTime)
{
bool flag = true;
student_StaticRepository.DeleteStudentStaticByProcRepository();
var date = Convert.ToDateTime(StartTime);
var endTime = Convert.ToDateTime(EndTime);
int Days = (endTime - date).Days;
for (int i = 0; i <= Days; i++)
{
var newDate = date.AddDays(i);
var procModel = student_StaticRepository.GetStudentStaticByProcRepository(Common.ConvertHelper.FormatDate(newDate));
var newModel = new RB_Student_Static()
{
Id = 0,
Date = newDate,
PushCount = procModel?.PushCount ?? 0,
NewCount = procModel?.NewCount ?? 0,
CommunicationCount = procModel?.CommunicationCount ?? 0,
TrialLessonCount = procModel?.TrialLessonCount ?? 0,
NotContacted = procModel?.NotContacted ?? 0,
JPCount = procModel?.JPCount ?? 0,
KRCount = procModel?.KRCount ?? 0,
FRCount = procModel?.FRCount ?? 0,
JPStudyCount = procModel?.JPStudyCount ?? 0,
KRStudyCount = procModel?.KRStudyCount ?? 0,
YGAStudyCount = procModel?.YGAStudyCount ?? 0,
USStudyCount = procModel?.USStudyCount ?? 0,
SGStudyCount = procModel?.SGStudyCount ?? 0,
AXStudyCount = procModel?.AXStudyCount ?? 0,
OtherCount = procModel?.OtherCount ?? 0,
ClassACount = procModel?.ClassACount ?? 0,
ClassBCount = procModel?.ClassBCount ?? 0,
ClassCCount = procModel?.ClassCCount ?? 0,
ClassDCount = procModel?.ClassDCount ?? 0,
CustomerCount = procModel?.CustomerCount ?? 0,
B2CCount = procModel?.B2CCount ?? 0,
TransCount = procModel?.TransCount ?? 0,
InnerCount = procModel?.InnerCount ?? 0,
InvalidCount = procModel?.InvalidCount ?? 0,
SuspectedCount = procModel?.SuspectedCount ?? 0,
IntentionCount = procModel?.IntentionCount ?? 0,
InvitationCount = procModel?.InvitationCount ?? 0,
NegotiationCount = procModel?.NegotiationCount ?? 0,
ContractCount = procModel?.ContractCount ?? 0,
OrderMoney = procModel?.OrderMoney ?? 0,
StudyOrderMoney = procModel?.StudyOrderMoney ?? 0,
YearStr = newDate.Year,
MonthStr = newDate.Month,
};
int times = 1;
int newDay = newDate.Day;
if (newDay >= 1 && newDay <= 10)
{
times = 1;
//记录上月最后一个时段合计数据
if (newDay == 1)
{
var lastMonthDay = newDate.AddMonths(-1);
var lastMonthLastTimeList = student_StaticRepository.GetStudentStaticListRepository(new RB_Student_Static_Extend()
{
YearStr = lastMonthDay.Year,
MonthStr = lastMonthDay.Month,
Times = 3
});
var staticModel = new RB_Student_Static()
{
Id = 0,
PushCount = lastMonthLastTimeList?.Sum(qitem=>qitem.PushCount)??0,
NewCount = lastMonthLastTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = lastMonthLastTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
TrialLessonCount = lastMonthLastTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = lastMonthLastTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
JPCount = lastMonthLastTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = lastMonthLastTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = lastMonthLastTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
JPStudyCount = lastMonthLastTimeList?.Sum(qitem => qitem.JPStudyCount) ?? 0,
KRStudyCount = lastMonthLastTimeList?.Sum(qitem => qitem.KRStudyCount) ?? 0,
YGAStudyCount = lastMonthLastTimeList?.Sum(qitem => qitem.YGAStudyCount) ?? 0,
USStudyCount = lastMonthLastTimeList?.Sum(qitem => qitem.USStudyCount) ?? 0,
SGStudyCount = lastMonthLastTimeList?.Sum(qitem => qitem.SGStudyCount) ?? 0,
AXStudyCount = lastMonthLastTimeList?.Sum(qitem => qitem.AXStudyCount) ?? 0,
OtherCount = lastMonthLastTimeList?.Sum(qitem => qitem.OtherCount) ?? 0,
ClassACount = lastMonthLastTimeList?.Sum(qitem => qitem.ClassACount) ?? 0,
ClassBCount = lastMonthLastTimeList?.Sum(qitem => qitem.ClassBCount) ?? 0,
ClassCCount = lastMonthLastTimeList?.Sum(qitem => qitem.ClassCCount) ?? 0,
ClassDCount = lastMonthLastTimeList?.Sum(qitem => qitem.ClassDCount) ?? 0,
CustomerCount = lastMonthLastTimeList?.Sum(qitem => qitem.CustomerCount) ?? 0,
B2CCount = lastMonthLastTimeList?.Sum(qitem => qitem.B2CCount) ?? 0,
TransCount = lastMonthLastTimeList?.Sum(qitem => qitem.TransCount) ?? 0,
InnerCount = lastMonthLastTimeList?.Sum(qitem => qitem.InnerCount) ?? 0,
InvalidCount = lastMonthLastTimeList?.Sum(qitem => qitem.InvalidCount) ?? 0,
SuspectedCount = lastMonthLastTimeList?.Sum(qitem => qitem.SuspectedCount) ?? 0,
IntentionCount = lastMonthLastTimeList?.Sum(qitem => qitem.IntentionCount) ?? 0,
InvitationCount = lastMonthLastTimeList?.Sum(qitem => qitem.InvitationCount) ?? 0,
NegotiationCount = lastMonthLastTimeList?.Sum(qitem => qitem.NegotiationCount) ?? 0,
ContractCount = lastMonthLastTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
YearStr = newDate.Year,
MonthStr = newDate.Month,
};
staticModel.Times = 1;
staticModel.Group_Id = user.Group_Id;
staticModel.School_Id = user.School_Id;
staticModel.CreateBy = user.Id;
staticModel.CreateTime = DateTime.Now;
student_StaticRepository.Insert(staticModel);
}
}
else if (newDay >= 11 && newDay <= 20)
{
times = 2;
//记录本月第一阶段数据
if (newDay == 11)
{
var curMonthFirstTimeList = student_StaticRepository.GetStudentStaticListRepository(new RB_Student_Static_Extend()
{
YearStr = newDate.Year,
MonthStr = newDate.Month,
Times = 1
});
var firstTimeStaticModel = new RB_Student_Static()
{
Id = 0,
PushCount = curMonthFirstTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = curMonthFirstTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = curMonthFirstTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
TrialLessonCount = curMonthFirstTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = curMonthFirstTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
JPCount = curMonthFirstTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = curMonthFirstTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = curMonthFirstTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
JPStudyCount = curMonthFirstTimeList?.Sum(qitem => qitem.JPStudyCount) ?? 0,
KRStudyCount = curMonthFirstTimeList?.Sum(qitem => qitem.KRStudyCount) ?? 0,
YGAStudyCount = curMonthFirstTimeList?.Sum(qitem => qitem.YGAStudyCount) ?? 0,
USStudyCount = curMonthFirstTimeList?.Sum(qitem => qitem.USStudyCount) ?? 0,
SGStudyCount = curMonthFirstTimeList?.Sum(qitem => qitem.SGStudyCount) ?? 0,
AXStudyCount = curMonthFirstTimeList?.Sum(qitem => qitem.AXStudyCount) ?? 0,
OtherCount = curMonthFirstTimeList?.Sum(qitem => qitem.OtherCount) ?? 0,
ClassACount = curMonthFirstTimeList?.Sum(qitem => qitem.ClassACount) ?? 0,
ClassBCount = curMonthFirstTimeList?.Sum(qitem => qitem.ClassBCount) ?? 0,
ClassCCount = curMonthFirstTimeList?.Sum(qitem => qitem.ClassCCount) ?? 0,
ClassDCount = curMonthFirstTimeList?.Sum(qitem => qitem.ClassDCount) ?? 0,
CustomerCount = curMonthFirstTimeList?.Sum(qitem => qitem.CustomerCount) ?? 0,
B2CCount = curMonthFirstTimeList?.Sum(qitem => qitem.B2CCount) ?? 0,
TransCount = curMonthFirstTimeList?.Sum(qitem => qitem.TransCount) ?? 0,
InnerCount = curMonthFirstTimeList?.Sum(qitem => qitem.InnerCount) ?? 0,
InvalidCount = curMonthFirstTimeList?.Sum(qitem => qitem.InvalidCount) ?? 0,
SuspectedCount = curMonthFirstTimeList?.Sum(qitem => qitem.SuspectedCount) ?? 0,
IntentionCount = curMonthFirstTimeList?.Sum(qitem => qitem.IntentionCount) ?? 0,
InvitationCount = curMonthFirstTimeList?.Sum(qitem => qitem.InvitationCount) ?? 0,
NegotiationCount = curMonthFirstTimeList?.Sum(qitem => qitem.NegotiationCount) ?? 0,
ContractCount = curMonthFirstTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
YearStr = newDate.Year,
MonthStr = newDate.Month,
};
firstTimeStaticModel.Times = 2;
firstTimeStaticModel.Group_Id = user.Group_Id;
firstTimeStaticModel.School_Id = user.School_Id;
firstTimeStaticModel.CreateBy = user.Id;
firstTimeStaticModel.CreateTime = DateTime.Now;
student_StaticRepository.Insert(firstTimeStaticModel);
}
}
else
{
times = 3;
//记录本月第二阶段数据
if (newDay == 11)
{
var curMonthSecondTimeList = student_StaticRepository.GetStudentStaticListRepository(new RB_Student_Static_Extend()
{
YearStr = newDate.Year,
MonthStr = newDate.Month,
Times = 2
});
var secondTimeStaticModel = new RB_Student_Static()
{
Id = 0,
PushCount = curMonthSecondTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = curMonthSecondTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = curMonthSecondTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
TrialLessonCount = curMonthSecondTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = curMonthSecondTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
JPCount = curMonthSecondTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = curMonthSecondTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = curMonthSecondTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
JPStudyCount = curMonthSecondTimeList?.Sum(qitem => qitem.JPStudyCount) ?? 0,
KRStudyCount = curMonthSecondTimeList?.Sum(qitem => qitem.KRStudyCount) ?? 0,
YGAStudyCount = curMonthSecondTimeList?.Sum(qitem => qitem.YGAStudyCount) ?? 0,
USStudyCount = curMonthSecondTimeList?.Sum(qitem => qitem.USStudyCount) ?? 0,
SGStudyCount = curMonthSecondTimeList?.Sum(qitem => qitem.SGStudyCount) ?? 0,
AXStudyCount = curMonthSecondTimeList?.Sum(qitem => qitem.AXStudyCount) ?? 0,
OtherCount = curMonthSecondTimeList?.Sum(qitem => qitem.OtherCount) ?? 0,
ClassACount = curMonthSecondTimeList?.Sum(qitem => qitem.ClassACount) ?? 0,
ClassBCount = curMonthSecondTimeList?.Sum(qitem => qitem.ClassBCount) ?? 0,
ClassCCount = curMonthSecondTimeList?.Sum(qitem => qitem.ClassCCount) ?? 0,
ClassDCount = curMonthSecondTimeList?.Sum(qitem => qitem.ClassDCount) ?? 0,
CustomerCount = curMonthSecondTimeList?.Sum(qitem => qitem.CustomerCount) ?? 0,
B2CCount = curMonthSecondTimeList?.Sum(qitem => qitem.B2CCount) ?? 0,
TransCount = curMonthSecondTimeList?.Sum(qitem => qitem.TransCount) ?? 0,
InnerCount = curMonthSecondTimeList?.Sum(qitem => qitem.InnerCount) ?? 0,
InvalidCount = curMonthSecondTimeList?.Sum(qitem => qitem.InvalidCount) ?? 0,
SuspectedCount = curMonthSecondTimeList?.Sum(qitem => qitem.SuspectedCount) ?? 0,
IntentionCount = curMonthSecondTimeList?.Sum(qitem => qitem.IntentionCount) ?? 0,
InvitationCount = curMonthSecondTimeList?.Sum(qitem => qitem.InvitationCount) ?? 0,
NegotiationCount = curMonthSecondTimeList?.Sum(qitem => qitem.NegotiationCount) ?? 0,
ContractCount = curMonthSecondTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
YearStr = newDate.Year,
MonthStr = newDate.Month,
};
secondTimeStaticModel.Times = 3;
secondTimeStaticModel.Group_Id = user.Group_Id;
secondTimeStaticModel.School_Id = user.School_Id;
secondTimeStaticModel.CreateBy = user.Id;
secondTimeStaticModel.CreateTime = DateTime.Now;
student_StaticRepository.Insert(secondTimeStaticModel);
}
}
newModel.Times = times;
newModel.Group_Id = user.Group_Id;
newModel.School_Id = user.School_Id;
newModel.CreateBy = user.Id;
newModel.CreateTime = DateTime.Now;
if (flag)
{
var newId = student_StaticRepository.Insert(newModel);
newModel.Id = newId;
flag = newId > 0;
}
}
return flag;
}
#endregion
}
}
Edu.Repository/User/RB_Student_StaticRepository.cs
View file @ 4a800d17
......@@ -2,8 +2,10 @@
using Edu.Model.ViewModel.User;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using VT.FW.DB.Dapper;
namespace Edu.Repository.User
{
......@@ -40,8 +42,38 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Static_Extend.MonthStr), query.MonthStr);
}
if (query.Times > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Static_Extend.Times), query.Times);
}
}
return Get<RB_Student_Static_Extend>(builder.ToString()).ToList();
}
/// <summary>
/// 根据存储过程统计客户信息
/// </summary>
/// <param name="DateStr"></param>
/// <returns></returns>
public RB_Student_Static_Extend GetStudentStaticByProcRepository(string DateStr)
{
//var parameters = new DynamicParameters();
//string procName = "proc_student_static";
//parameters.Add("StartTime", DateStr, direction: ParameterDirection.Input);
//return Get<RB_Student_Static_Extend>(procName, parameters, commandType: CommandType.StoredProcedure)?.FirstOrDefault();
string sql = string.Format("call proc_student_static('{0}') ", DateStr);
var list = Get<RB_Student_Static_Extend>(sql);
return list?.FirstOrDefault();
}
/// <summary>
/// 清楚数据
/// </summary>
public void DeleteStudentStaticByProcRepository()
{
string sql = "TRUNCATE TABLE rb_student_static";
base.Execute(sql);
}
}
}
Edu.WebApi/Controllers/User/StudentStatController.cs
View file @ 4a800d17
......@@ -48,29 +48,29 @@ namespace Edu.WebApi.Controllers.User
ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
RB_Student_ViewModel demodel = new RB_Student_ViewModel()
{
BelongType=base.ParmJObj.GetInt("BelongType"),
ConsultantId=base.ParmJObj.GetInt("ConsultantId"),
CourseId=base.ParmJObj.GetInt("CourseId"),
CreateType=(StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
EFTime=base.ParmJObj.GetStringValue("EFTime"),
IsQueryMyStu=base.ParmJObj.GetInt("IsQueryMyStu"),
QQ=base.ParmJObj.GetStringValue("QQ"),
Q_FType=base.ParmJObj.GetInt("Q_FType"),
SFTime=base.ParmJObj.GetStringValue("SFTime"),
StuChannel=base.ParmJObj.GetInt("StuChannel"),
StuGuestState=(GuestStateEnum)base.ParmJObj.GetInt("StuGuestState"),
StuName=base.ParmJObj.GetStringValue("StuName"),
StuRealMobile=base.ParmJObj.GetStringValue("StuRealMobile"),
StuSourceId=base.ParmJObj.GetInt("StuSourceId"),
StuStage=base.ParmJObj.GetInt("StuStage"),
StuType=base.ParmJObj.GetInt("StuType"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"),
StuPurpose=base.ParmJObj.GetInt("StuPurpose"),
BelongType = base.ParmJObj.GetInt("BelongType"),
ConsultantId = base.ParmJObj.GetInt("ConsultantId"),
CourseId = base.ParmJObj.GetInt("CourseId"),
CreateType = (StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
EFTime = base.ParmJObj.GetStringValue("EFTime"),
IsQueryMyStu = base.ParmJObj.GetInt("IsQueryMyStu"),
QQ = base.ParmJObj.GetStringValue("QQ"),
Q_FType = base.ParmJObj.GetInt("Q_FType"),
SFTime = base.ParmJObj.GetStringValue("SFTime"),
StuChannel = base.ParmJObj.GetInt("StuChannel"),
StuGuestState = (GuestStateEnum)base.ParmJObj.GetInt("StuGuestState"),
StuName = base.ParmJObj.GetStringValue("StuName"),
StuRealMobile = base.ParmJObj.GetStringValue("StuRealMobile"),
StuSourceId = base.ParmJObj.GetInt("StuSourceId"),
StuStage = base.ParmJObj.GetInt("StuStage"),
StuType = base.ParmJObj.GetInt("StuType"),
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
StuPurpose = base.ParmJObj.GetInt("StuPurpose"),
};
string schoolId = base.ParmJObj.GetStringValue("School_Id");
if (schoolId != "-1")
{
demodel.School_Id= base.ParmJObj.GetInt("School_Id");
demodel.School_Id = base.ParmJObj.GetInt("School_Id");
}
string CreateIds = base.ParmJObj.GetStringValue("CreateIds");
if (!string.IsNullOrEmpty(CreateIds))
......@@ -206,7 +206,7 @@ namespace Edu.WebApi.Controllers.User
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 = 25 });
subHeader.ExcelRows.Add(new ExcelColumn(value: "教师跟踪时间及情况说明") { CellWidth = 30 });
subHeader.ExcelRows.Add(new ExcelColumn(value: "顾问跟踪时间及情况说明") { CellWidth = 30 });
}
......@@ -317,21 +317,21 @@ namespace Edu.WebApi.Controllers.User
ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
RB_Student_ViewModel demodel = new RB_Student_ViewModel()
{
BelongType=base.ParmJObj.GetInt("BelongType"),
ConsultantId=base.ParmJObj.GetInt("ConsultantId"),
EFTime=base.ParmJObj.GetStringValue("EFTime"),
IsQueryMyStu=base.ParmJObj.GetInt("IsQueryMyStu"),
QQ=base.ParmJObj.GetStringValue("QQ"),
Q_EnrollState=base.ParmJObj.GetInt("Q_EnrollState"),
Q_FType=base.ParmJObj.GetInt("Q_FType"),
SFTime=base.ParmJObj.GetStringValue("SFTime"),
StuChannel=base.ParmJObj.GetInt("StuChannel"),
StuGuestState=(GuestStateEnum)base.ParmJObj.GetInt("StuGuestState"),
BelongType = base.ParmJObj.GetInt("BelongType"),
ConsultantId = base.ParmJObj.GetInt("ConsultantId"),
EFTime = base.ParmJObj.GetStringValue("EFTime"),
IsQueryMyStu = base.ParmJObj.GetInt("IsQueryMyStu"),
QQ = base.ParmJObj.GetStringValue("QQ"),
Q_EnrollState = base.ParmJObj.GetInt("Q_EnrollState"),
Q_FType = base.ParmJObj.GetInt("Q_FType"),
SFTime = base.ParmJObj.GetStringValue("SFTime"),
StuChannel = base.ParmJObj.GetInt("StuChannel"),
StuGuestState = (GuestStateEnum)base.ParmJObj.GetInt("StuGuestState"),
StuName = base.ParmJObj.GetStringValue("StuName"),
StuRealMobile=base.ParmJObj.GetStringValue("StuRealMobile"),
StuStage=base.ParmJObj.GetInt("StuStage"),
StuType=base.ParmJObj.GetInt("StuType"),
WeChatNo=base.ParmJObj.GetStringValue("WeChatNo"),
StuRealMobile = base.ParmJObj.GetStringValue("StuRealMobile"),
StuStage = base.ParmJObj.GetInt("StuStage"),
StuType = base.ParmJObj.GetInt("StuType"),
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
};
List<int> empIds = new List<int>();
string createIds = base.ParmJObj.GetStringValue("CreateIds");
......@@ -475,7 +475,7 @@ namespace Edu.WebApi.Controllers.User
string FURemark = dObj.GetStringValue("FURemark");
if (!string.IsNullOrEmpty(FURemark))
{
remark += "\r\n" +StringHelper.FilterHtml(FURemark);
remark += "\r\n" + StringHelper.FilterHtml(FURemark);
}
columns.Add(new ExcelColumn()
{
......@@ -499,5 +499,42 @@ namespace Edu.WebApi.Controllers.User
}
}
#endregion
/// <summary>
/// 获取学员跟进分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentStatic()
{
var query = new RB_Student_Static_Extend()
{
YearStr = base.ParmJObj.GetInt("YearStr"),
MonthStr = base.ParmJObj.GetInt("MonthStr")
};
query.Group_Id = base.UserInfo.Group_Id;
var list = studentStatModule.GetStudentStaticListModule(query);
return ApiResult.Success(data: list);
}
/// <summary>
/// 初始化学员统计数据
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult InitStudentStatic()
{
var userInfo = base.UserInfo;
string StartTime = base.ParmJObj.GetStringValue("StartTime");
if (string.IsNullOrEmpty(StartTime))
{
StartTime = Common.ConvertHelper.FormatDate(DateTime.Now);
}
StartTime = "2021-12-21";
string EndTime = Common.ConvertHelper.FormatDate(DateTime.Now);
bool flag = studentStatModule.CreateStudentStaticModule(userInfo, StartTime, EndTime);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
}
}
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