Skip to content

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

页面修改

parent c5c1d9ef
Expand all Hide 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
This diff is collapsed.
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
......@@ -42,35 +42,35 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentFollowUpPageList()
public ApiResult GetStudentFollowUpPageList()
{
var userInfo = base.UserInfo;
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 });
}
......@@ -274,7 +274,7 @@ namespace Edu.WebApi.Controllers.User
string ConsultantTime = mObj.GetStringValue("ConsultantTime");
string Consultant = mObj.GetStringValue("Consultant");
string columns3 = ConsultantTime;
if (!string.IsNullOrEmpty(Consultant))
{
......@@ -290,7 +290,7 @@ namespace Edu.WebApi.Controllers.User
slist.Add(dataRow);
}
}
var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData, "application/octet-stream", excelName);
}
......@@ -302,36 +302,36 @@ namespace Edu.WebApi.Controllers.User
}
}
#endregion
#endregion
#region 客人咨询
#region 客人咨询
/// <summary>
/// 获取学员咨询分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
/// <summary>
/// 获取学员咨询分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentConsultPageList()
{
var userInfo = base.UserInfo;
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");
......@@ -434,7 +434,7 @@ namespace Edu.WebApi.Controllers.User
new ExcelColumn("规划课程及报价"){ CellWidth=20},
new ExcelColumn("客户情况分析"){ CellWidth=50},
new ExcelColumn("顾问跟进备注"){ CellWidth=50},
}
};
slist.Add(header);
......@@ -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