Skip to content

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

页面修改

parent 8b14cabb
Show 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 ...@@ -148,5 +148,10 @@ namespace Edu.Model.ViewModel.User
/// 订单创建时间 /// 订单创建时间
/// </summary> /// </summary>
public DateTime OrderCreateTime { get; set; } 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 ...@@ -445,5 +445,10 @@ namespace Edu.Model.ViewModel.User
/// 查询类型(1-课程顾问，2-老师,3-市场) /// 查询类型(1-课程顾问，2-老师,3-市场)
/// </summary> /// </summary>
public int QueryTpye { get; set; } 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 ...@@ -157,7 +157,6 @@ namespace Edu.Module.User
/// </summary> /// </summary>
private readonly RB_Order_ReturnComissionRepository returnComissionRepository = new RB_Order_ReturnComissionRepository(); private readonly RB_Order_ReturnComissionRepository returnComissionRepository = new RB_Order_ReturnComissionRepository();
/// <summary> /// <summary>
/// 获取学生列表 /// 获取学生列表
/// </summary> /// </summary>
...@@ -1166,26 +1165,27 @@ namespace Edu.Module.User ...@@ -1166,26 +1165,27 @@ namespace Edu.Module.User
/// <param name="receiveId"></param> /// <param name="receiveId"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <returns></returns> /// <returns></returns>
//public string SetUserLeaveStudentCareOf(int userId, int receiveId, UserInfo userInfo) public string SetUserLeaveStudentCareOf(int userId, int receiveId, UserInfo userInfo)
//{ {
// var eModel = accountModule.GetEmployeeInfo(userId); var eModel = accountModule.GetEmployeeInfo(userId);
// var reModel = accountModule.GetEmployeeInfo(receiveId); var reModel = accountModule.GetEmployeeInfo(receiveId);
// if (eModel == null || reModel == null) { return "转交人不存在"; } if (eModel == null || reModel == null) { return "转交人不存在"; }
// if (reModel.IsLeave != 1) { return "转交人非在职状态，无法交接"; } if (reModel.IsLeave != 1) { return "转交人非在职状态，无法交接"; }
// //获取学员负责人 / 服务人员 //获取学员负责人 / 服务人员
// var list = studentRepository.GetUserStudentCareOf(userId, userInfo.Group_Id); var list = studentRepository.GetUserStudentCareOf(userId, userInfo.Group_Id);
// if (list.Any()) if (list.Any())
// { {
// //查询所有的服务人员 ////查询所有的服务人员
// var alist = student_AssistRepository.GetUserStudentAssistCareOf(userId, userInfo.Group_Id); //var alist = student_AssistRepository.GetUserStudentAssistCareOf(userId, userInfo.Group_Id);
// var trans = studentRepository.DbTransaction; //var trans = studentRepository.DbTransaction;
// try //try
// { //{
// foreach (var item in list) // foreach (var item in list)
// { // {
// bool flag = true; // bool flag = true;
// if (item.CreateBy == userId) { // if (item.CreateBy == userId)
// {
// Dictionary<string, object> keyValues = new Dictionary<string, object>() { // Dictionary<string, object> keyValues = new Dictionary<string, object>() {
// { nameof(RB_Student_ViewModel.CreateBy), receiveId} // { nameof(RB_Student_ViewModel.CreateBy), receiveId}
// }; // };
...@@ -1198,9 +1198,11 @@ namespace Edu.Module.User ...@@ -1198,9 +1198,11 @@ namespace Edu.Module.User
// }; // };
// flag = studentRepository.Update(keyValues, wheres, trans); // flag = studentRepository.Update(keyValues, wheres, trans);
// } // }
// if (flag) { // if (flag)
// {
// var clist = alist.Where(x => x.StuId == item.StuId).ToList(); // var clist = alist.Where(x => x.StuId == item.StuId).ToList();
// foreach (var qitem in clist) { // foreach (var qitem in clist)
// {
// Dictionary<string, object> keyValues = new Dictionary<string, object>() { // Dictionary<string, object> keyValues = new Dictionary<string, object>() {
// { nameof(RB_Student_Assist_Extend.AssistId),receiveId}, // { nameof(RB_Student_Assist_Extend.AssistId),receiveId},
// }; // };
...@@ -1214,7 +1216,8 @@ namespace Edu.Module.User ...@@ -1214,7 +1216,8 @@ namespace Edu.Module.User
// flag = student_AssistRepository.Update(keyValues, wheres, trans); // flag = student_AssistRepository.Update(keyValues, wheres, trans);
// } // }
// } // }
// if (flag) { // if (flag)
// {
// //插入日志 // //插入日志
// student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log() // student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
// { // {
...@@ -1231,28 +1234,30 @@ namespace Edu.Module.User ...@@ -1231,28 +1234,30 @@ namespace Edu.Module.User
// } // }
// } // }
// studentRepository.DBSession.Commit(); // studentRepository.DBSession.Commit();
// } //}
// catch (Exception ex) //catch (Exception ex)
// { //{
// LogHelper.Write(ex, "SetUserLeaveStudentCareOf"); // LogHelper.Write(ex, "SetUserLeaveStudentCareOf");
// studentRepository.DBSession.Rollback(); // studentRepository.DBSession.Rollback();
// return "学员转交出错了，请联系管理员"; // return "学员转交出错了，请联系管理员";
// }
// }
// return "";
//} //}
}
return "";
}
#endregion #endregion
/// <summary> /// <summary>
/// 今日需联系线索（之前预约或者24小时内收到的新线索） /// 今日需联系线索（之前预约或者24小时内收到的新线索）
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="pageIndex"></param>
/// <param name="receiveId"></param> /// <param name="pageSize"></param>
/// <param name="userInfo"></param> /// <param name="rowsCount"></param>
/// <param name="CreateBy"></param>
/// <returns></returns> /// <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>(); List<object> result = new List<object>();
var list = student_AppointmentRepository.GetStudentVisitListRepository(new RB_Student_Appointment_Extend() var list = student_AppointmentRepository.GetStudentVisitListRepository(new RB_Student_Appointment_Extend()
{ {
...@@ -1285,10 +1290,56 @@ namespace Edu.Module.User ...@@ -1285,10 +1290,56 @@ namespace Edu.Module.User
return result; 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>
/// 获取马上要毕业的学生 /// 获取马上要毕业的学生
/// </summary> /// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="UserId"></param>
/// <returns></returns> /// <returns></returns>
public List<object> GetStraightwayGraduateStudentModule(int pageIndex, int pageSize, out long rowsCount, int UserId) public List<object> GetStraightwayGraduateStudentModule(int pageIndex, int pageSize, out long rowsCount, int UserId)
{ {
...@@ -1410,13 +1461,13 @@ namespace Edu.Module.User ...@@ -1410,13 +1461,13 @@ namespace Edu.Module.User
/// 获取未完成的订单 /// 获取未完成的订单
/// </summary> /// </summary>
/// <returns></returns> /// <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() var query = new RB_Order_ViewModel()
{ {
Q_OrderState=1, Q_OrderState = 1,
Q_NotCollect=1, Q_NotCollect = 1,
CreateBy=UserId CreateBy = UserId
}; };
//获取订单列表 //获取订单列表
var orderList = orderRepository.GetOrderPageRepository(pageIndex, pageSize, out rowsCount, query); var orderList = orderRepository.GetOrderPageRepository(pageIndex, pageSize, out rowsCount, query);
...@@ -1537,14 +1588,87 @@ namespace Edu.Module.User ...@@ -1537,14 +1588,87 @@ namespace Edu.Module.User
/// </summary> /// </summary>
public List<object> GetContractNotModule(int pageIndex, int pageSize, out long rowsCount, int UserId) 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>(); List<object> result = new List<object>();
rowsCount = 0; 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; 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} ...@@ -1376,25 +1376,6 @@ WHERE 1=1 AND A.OrderState IN(1,2) {0}
return dicList; 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 ...@@ -458,6 +458,12 @@ WHERE 1=1
nameof(RB_Student_ViewModel.StuSourceId), nameof(RB_Student_ViewModel.StuSourceId),
query.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)); 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(); 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.Common.Enum;
using Edu.Model.Entity.User; using Edu.Model.Entity.User;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
...@@ -57,7 +56,6 @@ WHERE 1=1 AND C.OrderState IN(1) AND D.Status=0 ...@@ -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); builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.QStudentIds);
} }
if (query.Account_Id > 0) if (query.Account_Id > 0)
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id); 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 ...@@ -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 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);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null) if (query != null)
{ {
if (query.ClassId > 0) if (query.ClassId > 0)
...@@ -174,6 +172,15 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=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); 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(); 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 ...@@ -77,7 +77,7 @@ WHERE 1=1
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <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(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
......
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @ 4a8e85a0
...@@ -2680,7 +2680,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -2680,7 +2680,7 @@ namespace Edu.WebApi.Controllers.User
ExcelDataSource subHeader = new ExcelDataSource() { ExcelRows = new List<ExcelColumn>() }; ExcelDataSource subHeader = new ExcelDataSource() { ExcelRows = new List<ExcelColumn>() };
header.ExcelRows.Add(new ExcelColumn("员工") { Rowspan = 2, CellWidth = 15 }); header.ExcelRows.Add(new ExcelColumn("员工") { Rowspan = 2, CellWidth = 15 });
subHeader.ExcelRows.Add(new ExcelColumn()); 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("本周"));
subHeader.ExcelRows.Add(new ExcelColumn("本月")); subHeader.ExcelRows.Add(new ExcelColumn("本月"));
...@@ -3319,21 +3319,28 @@ namespace Edu.WebApi.Controllers.User ...@@ -3319,21 +3319,28 @@ namespace Edu.WebApi.Controllers.User
#region 首页待办工作视图统计 #region 首页待办工作视图统计
/// <summary> /// <summary>
/// 今日需联系线索 /// 今日需联系线索（之前预约或者24小时内收到的新线索）
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public ApiResult GetTodayClue() public ApiResult GetTodayClue()
{ {
var list = studentModule.GetTodayVisitModule(base.UserInfo.Id); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
return ApiResult.Success(data: list); 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>
/// 今日需联系学员（之前预约的跟进学员或本周期内需要跟进的学员） /// 今日需联系学员（之前预约的跟进学员或本周期内需要跟进的学员）
/// </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> /// <summary>
...@@ -3342,7 +3349,11 @@ namespace Edu.WebApi.Controllers.User ...@@ -3342,7 +3349,11 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns> /// <returns></returns>
public ApiResult MyClue() 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> /// <summary>
...@@ -3351,7 +3362,11 @@ namespace Edu.WebApi.Controllers.User ...@@ -3351,7 +3362,11 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns> /// <returns></returns>
public ApiResult MyStudent() 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> /// <summary>
...@@ -3401,7 +3416,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -3401,7 +3416,7 @@ namespace Edu.WebApi.Controllers.User
public ApiResult GraduateStudent() public ApiResult GraduateStudent()
{ {
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); 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.PageData = list;
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel); 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