Skip to content

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

页面修改

parent 8b14cabb
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 123 deletions
Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs
View file @ 4a8e85a0
......@@ -148,5 +148,10 @@ namespace Edu.Model.ViewModel.User
/// 订单创建时间
/// </summary>
public DateTime OrderCreateTime { get; set; }
/// <summary>
/// 查询未领取合同学员
/// </summary>
public int IsNotContract { get; set; }
}
}
Edu.Model/ViewModel/User/RB_Student_ViewModel.cs
View file @ 4a8e85a0
......@@ -445,5 +445,10 @@ namespace Edu.Model.ViewModel.User
/// 查询类型(1-课程顾问，2-老师,3-市场)
/// </summary>
public int QueryTpye { get; set; }
/// <summary>
/// 查询未跟进学员
/// </summary>
public int IsQueryNotFollow { get; set; }
}
}
\ No newline at end of file
Edu.Module.User/StudentModule.cs
View file @ 4a8e85a0
......@@ -157,7 +157,6 @@ namespace Edu.Module.User
/// </summary>
private readonly RB_Order_ReturnComissionRepository returnComissionRepository = new RB_Order_ReturnComissionRepository();
/// <summary>
/// 获取学生列表
/// </summary>
......@@ -1166,93 +1165,99 @@ namespace Edu.Module.User
/// <param name="receiveId"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
//public string SetUserLeaveStudentCareOf(int userId, int receiveId, UserInfo userInfo)
//{
// var eModel = accountModule.GetEmployeeInfo(userId);
// var reModel = accountModule.GetEmployeeInfo(receiveId);
// if (eModel == null || reModel == null) { return "转交人不存在"; }
// if (reModel.IsLeave != 1) { return "转交人非在职状态，无法交接"; }
// //获取学员负责人 / 服务人员
// var list = studentRepository.GetUserStudentCareOf(userId, userInfo.Group_Id);
// if (list.Any())
// {
// //查询所有的服务人员
// var alist = student_AssistRepository.GetUserStudentAssistCareOf(userId, userInfo.Group_Id);
// var trans = studentRepository.DbTransaction;
// try
// {
// foreach (var item in list)
// {
// bool flag = true;
// if (item.CreateBy == userId) {
// Dictionary<string, object> keyValues = new Dictionary<string, object>() {
// { nameof(RB_Student_ViewModel.CreateBy), receiveId}
// };
// List<WhereHelper> wheres = new List<WhereHelper>() {
// new WhereHelper(){
// FiledName = nameof(RB_Student_ViewModel.StuId),
// FiledValue = item.StuId,
// OperatorEnum =OperatorEnum.Equal
// }
// };
// flag = studentRepository.Update(keyValues, wheres, trans);
// }
// if (flag) {
// var clist = alist.Where(x => x.StuId == item.StuId).ToList();
// foreach (var qitem in clist) {
// Dictionary<string, object> keyValues = new Dictionary<string, object>() {
// { nameof(RB_Student_Assist_Extend.AssistId),receiveId},
// };
// List<WhereHelper> wheres = new List<WhereHelper>() {
// new WhereHelper(){
// FiledName = nameof(RB_Student_Assist_Extend.Id),
// FiledValue = qitem.Id,
// OperatorEnum =OperatorEnum.Equal
// }
// };
// flag = student_AssistRepository.Update(keyValues, wheres, trans);
// }
// }
// if (flag) {
// //插入日志
// student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
// {
// CreateBy = userInfo.Id,
// CreateTime = DateTime.Now,
// CreateType = 1,
// Group_Id = userInfo.Group_Id,
// LogContent = "离职转交客人负责人与服务人员，由【" + eModel.EmployeeName + "(" + userId + ")" + "】转交给【" + reModel.EmployeeName + "(" + receiveId + ")" + "】",
// LogId = 0,
// LogTitle = "离职转交学员",
// LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo,
// StuId = item.StuId
// }, trans);
// }
// }
// studentRepository.DBSession.Commit();
// }
// catch (Exception ex)
// {
// LogHelper.Write(ex, "SetUserLeaveStudentCareOf");
// studentRepository.DBSession.Rollback();
// return "学员转交出错了，请联系管理员";
// }
// }
// return "";
//}
public string SetUserLeaveStudentCareOf(int userId, int receiveId, UserInfo userInfo)
{
var eModel = accountModule.GetEmployeeInfo(userId);
var reModel = accountModule.GetEmployeeInfo(receiveId);
if (eModel == null || reModel == null) { return "转交人不存在"; }
if (reModel.IsLeave != 1) { return "转交人非在职状态，无法交接"; }
//获取学员负责人 / 服务人员
var list = studentRepository.GetUserStudentCareOf(userId, userInfo.Group_Id);
if (list.Any())
{
////查询所有的服务人员
//var alist = student_AssistRepository.GetUserStudentAssistCareOf(userId, userInfo.Group_Id);
//var trans = studentRepository.DbTransaction;
//try
//{
// foreach (var item in list)
// {
// bool flag = true;
// if (item.CreateBy == userId)
// {
// Dictionary<string, object> keyValues = new Dictionary<string, object>() {
// { nameof(RB_Student_ViewModel.CreateBy), receiveId}
// };
// List<WhereHelper> wheres = new List<WhereHelper>() {
// new WhereHelper(){
// FiledName = nameof(RB_Student_ViewModel.StuId),
// FiledValue = item.StuId,
// OperatorEnum =OperatorEnum.Equal
// }
// };
// flag = studentRepository.Update(keyValues, wheres, trans);
// }
// if (flag)
// {
// var clist = alist.Where(x => x.StuId == item.StuId).ToList();
// foreach (var qitem in clist)
// {
// Dictionary<string, object> keyValues = new Dictionary<string, object>() {
// { nameof(RB_Student_Assist_Extend.AssistId),receiveId},
// };
// List<WhereHelper> wheres = new List<WhereHelper>() {
// new WhereHelper(){
// FiledName = nameof(RB_Student_Assist_Extend.Id),
// FiledValue = qitem.Id,
// OperatorEnum =OperatorEnum.Equal
// }
// };
// flag = student_AssistRepository.Update(keyValues, wheres, trans);
// }
// }
// if (flag)
// {
// //插入日志
// student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
// {
// CreateBy = userInfo.Id,
// CreateTime = DateTime.Now,
// CreateType = 1,
// Group_Id = userInfo.Group_Id,
// LogContent = "离职转交客人负责人与服务人员，由【" + eModel.EmployeeName + "(" + userId + ")" + "】转交给【" + reModel.EmployeeName + "(" + receiveId + ")" + "】",
// LogId = 0,
// LogTitle = "离职转交学员",
// LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo,
// StuId = item.StuId
// }, trans);
// }
// }
// studentRepository.DBSession.Commit();
//}
//catch (Exception ex)
//{
// LogHelper.Write(ex, "SetUserLeaveStudentCareOf");
// studentRepository.DBSession.Rollback();
// return "学员转交出错了，请联系管理员";
//}
}
return "";
}
#endregion
/// <summary>
/// 今日需联系线索（之前预约或者24小时内收到的新线索）
/// </summary>
/// <param name="userId"></param>
/// <param name="receiveId"></param>
/// <param name="userInfo"></param>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="CreateBy"></param>
/// <returns></returns>
public List<object> GetTodayVisitModule(int CreateBy)
public List<object> GetTodayVisitModule(int pageIndex, int pageSize, out long rowsCount, int CreateBy)
{
rowsCount = 0;
List<object> result = new List<object>();
var list = student_AppointmentRepository.GetStudentVisitListRepository(new RB_Student_Appointment_Extend()
{
......@@ -1285,10 +1290,56 @@ namespace Edu.Module.User
return result;
}
/// <summary>
/// 今日需联系线索（之前预约或者24小时内收到的新线索）
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="CreateBy"></param>
/// <returns></returns>
public List<object> GetTodayContractStudentModule(int pageIndex, int pageSize, out long rowsCount, int CreateBy)
{
rowsCount = 0;
List<object> result = new List<object>();
var list = student_AppointmentRepository.GetStudentVisitListRepository(new RB_Student_Appointment_Extend()
{
QueryDate = Common.ConvertHelper.FormatDate(DateTime.Now),
CreateBy = CreateBy
});
if (list != null && list.Count > 0)
{
string createByIds = string.Join(",", list.Select(qitem => qitem.CreateBy));
List<RB_Account_ViewModel> empList = new List<RB_Account_ViewModel>();
if (!string.IsNullOrEmpty(createByIds))
{
empList = accountModule.GetAccountListExtModule(new RB_Account_ViewModel() { QIds = createByIds });
}
foreach (var item in list)
{
var tempEmp = empList?.FirstOrDefault(qitem => qitem.Id == item.CreateBy);
result.Add(new
{
item.Id,
item.StuId,
item.StuName,
item.CreateBy,
EmployeeName = tempEmp?.AccountName,
CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
item.Feedback,
});
}
}
return result;
}
/// <summary>
/// 获取马上要毕业的学生
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="UserId"></param>
/// <returns></returns>
public List<object> GetStraightwayGraduateStudentModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
......@@ -1410,13 +1461,13 @@ namespace Edu.Module.User
/// 获取未完成的订单
/// </summary>
/// <returns></returns>
public List<RB_Order_ViewModel> GetOrderNotModule(int pageIndex, int pageSize, out long rowsCount,int UserId)
public List<RB_Order_ViewModel> GetOrderNotModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
var query = new RB_Order_ViewModel()
{
Q_OrderState=1,
Q_NotCollect=1,
CreateBy=UserId
Q_OrderState = 1,
Q_NotCollect = 1,
CreateBy = UserId
};
//获取订单列表
var orderList = orderRepository.GetOrderPageRepository(pageIndex, pageSize, out rowsCount, query);
......@@ -1465,7 +1516,7 @@ namespace Edu.Module.User
var achList = sell_Achievements_EmpRepository.GetList(new RB_Sell_Achievements_Emp_ViewModel() { OrderIds = orderIds });
//获取订单的返佣
var rclist = returnComissionRepository.GetOrderReturnComissionListRepositpry(new RB_Order_ReturnComission_ViewModel() { QOrderIds = orderIds });
var rclist = returnComissionRepository.GetOrderReturnComissionListRepositpry(new RB_Order_ReturnComission_ViewModel() { QOrderIds = orderIds });
foreach (var item in orderList)
{
......@@ -1537,14 +1588,87 @@ namespace Edu.Module.User
/// </summary>
public List<object> GetContractNotModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
var query = new RB_Order_ViewModel()
var query = new RB_Student_OrderGuest_ViewModel()
{
IsNotContract = 1,
CreateBy = UserId,
};
List<object> result = new List<object>();
rowsCount = 0;
var list = orderRepository.GetNotContractPageRepository(pageIndex, pageSize, out rowsCount, query);
var list = student_OrderGuestRepository.GetStuOrderGuestPageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
}
}
return result;
}
/// <summary>
/// 分配给我的学员 （分配给我，但是没有跟进的学员）
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="UserId"></param>
/// <returns></returns>
public List<object> GetMyStudentModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
rowsCount = 0;
var query = new RB_Student_ViewModel()
{
IsQueryNotFollow = 1,
IsQueryMyStu = 1,
CreateBy = UserId
};
List<object> result = new List<object>();
var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
result.Add(new
{
item.StuId,
item.StuName,
});
}
}
return result;
}
/// <summary>
/// 分配给我的线索 （分配给我，但是没有跟进的线索）
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="UserId"></param>
/// <returns></returns>
public List<object> GetMyClueModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{
rowsCount = 0;
var query = new RB_Student_ViewModel()
{
IsQueryNotFollow = 1,
IsQueryMyStu = 1,
CreateBy = UserId
};
List<object> result = new List<object>();
var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
result.Add(new
{
item.StuId,
item.StuName,
});
}
}
return result;
}
}
......
Edu.Repository/Sell/RB_OrderRepository.cs
View file @ 4a8e85a0
......@@ -1376,25 +1376,6 @@ WHERE 1=1 AND A.OrderState IN(1,2) {0}
return dicList;
}
/// <summary>
/// 获取未领取合同的订单
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Order_ViewModel> GetNotContractPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM rb_order AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Order_ViewModel.OrderState), (int)OrderStateEnum.Normal);
builder.AppendFormat(" ");
return GetPage<RB_Order_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
}
}
}
Edu.Repository/User/RB_StudentRepository.cs
View file @ 4a8e85a0
......@@ -458,6 +458,12 @@ WHERE 1=1
nameof(RB_Student_ViewModel.StuSourceId),
query.StuSourceId);
}
//查询未跟进学员
if (query.IsQueryNotFollow == 1)
{
builder.AppendFormat(" AND NOT Exists (SELECT StuId FROM rb_student_follow WHERE `Status`=0 AND t.StuId=StuId) ");
}
}
builder.AppendFormat(" ORDER BY t.{0} DESC ", nameof(RB_Student_ViewModel.StuId));
return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
......
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
View file @ 4a8e85a0
using Edu.Common.Enum;
using Edu.Model.Entity.User;
using Edu.Model.ViewModel.User;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
......@@ -57,7 +56,6 @@ WHERE 1=1 AND C.OrderState IN(1) AND D.Status=0
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.QStudentIds);
}
if (query.Account_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id);
......@@ -84,7 +82,7 @@ FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C ON A.OrderId=C.OrderId
WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.ClassId > 0)
......@@ -174,6 +172,15 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id);
}
if (query.CreateBy > 0)
{
builder.AppendFormat(" AND (C.CreateBy={0} OR C.EnterID={0} OR C.CourseConsultantId={0}) ", query.CreateBy);
}
if (query.IsNotContract == 1)
{
builder.AppendFormat(" AND C.OrderType=1 and C.CourseId<>1 ");
builder.AppendFormat(@" AND NOT EXISTS(SELECT 1 FROM rb_education_contract WHERE A.OrderId=OrderId AND A.GuestId=GuestId AND `Status` NOT IN(4)) ");
}
}
return GetPage<RB_Student_OrderGuest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
}
......
Edu.Repository/User/RB_Teacher_StaticRepository.cs
View file @ 4a8e85a0
......@@ -77,7 +77,7 @@ WHERE 1=1
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Teacher_Static_Extend> GetTeacherStaticMonthExtListRepository(RB_Teacher_Static_Extend query, bool isYear = false)
public List<RB_Teacher_Static_Extend> GetTeacherStaticMonthExtListRepository(RB_Teacher_Static_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
......
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @ 4a8e85a0
......@@ -2675,12 +2675,12 @@ namespace Edu.WebApi.Controllers.User
}
var list = marketConsultantModule.DownLoadConsultantStaticModule(qEmpIds, startTime, endTime);
string excelName = "课程顾问部数据统计.xls";
ExcelDataSource header = new ExcelDataSource() { ExcelRows = new List<ExcelColumn>() };
ExcelDataSource subHeader = new ExcelDataSource() { ExcelRows = new List<ExcelColumn>() };
header.ExcelRows.Add(new ExcelColumn("员工") { Rowspan = 2, CellWidth = 15 });
subHeader.ExcelRows.Add(new ExcelColumn());
header.ExcelRows.Add(new ExcelColumn("名单") { CellWidth = 25,Colspan=2 });
header.ExcelRows.Add(new ExcelColumn("名单") { CellWidth = 25, Colspan = 2 });
subHeader.ExcelRows.Add(new ExcelColumn("本周"));
subHeader.ExcelRows.Add(new ExcelColumn("本月"));
......@@ -3319,21 +3319,28 @@ namespace Edu.WebApi.Controllers.User
#region 首页待办工作视图统计
/// <summary>
/// 今日需联系线索
/// 今日需联系线索（之前预约或者24小时内收到的新线索）
/// </summary>
/// <returns></returns>
public ApiResult GetTodayClue()
{
var list = studentModule.GetTodayVisitModule(base.UserInfo.Id);
return ApiResult.Success(data: list);
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var list = studentModule.GetTodayVisitModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 今日需联系学员（之前预约的跟进学员或本周期内需要跟进的学员）
/// </summary>
public ApiResult Get()
public ApiResult GetTodayContractStudent()
{
return ApiResult.Failed();
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var list = studentModule.GetTodayContractStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
}
/// <summary>
......@@ -3342,7 +3349,11 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns>
public ApiResult MyClue()
{
return ApiResult.Failed();
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var list = studentModule.GetMyClueModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
}
/// <summary>
......@@ -3351,7 +3362,11 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns>
public ApiResult MyStudent()
{
return ApiResult.Failed();
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var list = studentModule.GetMyStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
}
/// <summary>
......@@ -3378,7 +3393,7 @@ namespace Edu.WebApi.Controllers.User
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
}
/// <summary>
......@@ -3401,7 +3416,7 @@ namespace Edu.WebApi.Controllers.User
public ApiResult GraduateStudent()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var list= studentModule.GetStraightwayGraduateStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
var list = studentModule.GetStraightwayGraduateStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
......
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