Skip to content

E
Education
Commit 6e5383ec authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 16422809
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 7 deletions
Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs
View file @ 6e5383ec
......@@ -27,6 +27,11 @@ namespace Edu.Model.ViewModel.User
/// </summary>
public string ClassNo { get; set; }
/// <summary>
/// 课程名称
/// </summary>
public string CourseName { get; set; }
/// <summary>
/// 订单类型
/// </summary>
......@@ -61,5 +66,10 @@ namespace Edu.Model.ViewModel.User
/// 续费状态 1正常 2续费
/// </summary>
public int RenewState { get; set; }
/// <summary>
/// 学员名称
/// </summary>
public string GuestName { get; set; }
}
}
Edu.Module.Customer/CustomerStudentModule.cs
View file @ 6e5383ec
......@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
using System.Linq;
using Edu.Model.ViewModel.User;
namespace Edu.Module.Customer
{
......@@ -45,6 +46,11 @@ namespace Edu.Module.Customer
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary>
/// 学员订单仓储层对象
/// </summary>
private readonly RB_Student_OrderGuestRepository student_OrderGuestRepository = new RB_Student_OrderGuestRepository();
#region 学员约访
......@@ -129,7 +135,7 @@ namespace Edu.Module.Customer
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool RemoveStudentAppointmentModule(object Id,int Uid)
public bool RemoveStudentAppointmentModule(object Id, int Uid)
{
bool flag = false;
var model = GetStudentAppointmentModule(Id);
......@@ -211,7 +217,7 @@ namespace Edu.Module.Customer
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool RemoveStudentFollowModule(object Id,int Uid)
public bool RemoveStudentFollowModule(object Id, int Uid)
{
var model = GetStudentFollowModule(Id);
Dictionary<string, object> fileds = new Dictionary<string, object>()
......@@ -235,7 +241,7 @@ namespace Edu.Module.Customer
/// <returns></returns>
public List<RB_Student_Visit_Extend> GetStudentVisitPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_Visit_Extend query)
{
var list= student_VisitRepository.GetStudentVisitPageRepository(pageIndex, pageSize, out rowsCount, query);
var list = student_VisitRepository.GetStudentVisitPageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
string sids = string.Join(",", list.Select(qitem => qitem.School_Id));
......@@ -244,7 +250,8 @@ namespace Edu.Module.Customer
{
QSIds = sids
});
var empList = accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel() {
var empList = accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel()
{
QIds = empIds
});
foreach (var item in list)
......@@ -274,7 +281,7 @@ namespace Edu.Module.Customer
{
var schoolList = schoolRepository.GetSchoolListRepository(new Model.ViewModel.User.RB_School_ViewModel() { QSIds = oldModel.School_Id + "," + model.School_Id });
logContent += string.Format("校区：由【{0}】=>【{1}】,",
schoolList.FirstOrDefault(qitem=>qitem.SId== oldModel.School_Id)?.SName,
schoolList.FirstOrDefault(qitem => qitem.SId == oldModel.School_Id)?.SName,
schoolList.FirstOrDefault(qitem => qitem.SId == model.School_Id)?.SName);
}
if (oldModel.Date != model.Date)
......@@ -287,7 +294,7 @@ namespace Edu.Module.Customer
}
if (oldModel.ReceptionPersion != model.ReceptionPersion)
{
var empList= accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel()
var empList = accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel()
{
QIds = oldModel.ReceptionPersion + "," + model.ReceptionPersion
});
......@@ -342,7 +349,7 @@ namespace Edu.Module.Customer
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool RemoveStudentVisitModule(object Id,int Uid)
public bool RemoveStudentVisitModule(object Id, int Uid)
{
var model = GetStudentVisitModule(Id);
Dictionary<string, object> fileds = new Dictionary<string, object>()
......@@ -368,5 +375,29 @@ namespace Edu.Module.Customer
return list;
}
/// <summary>
/// 获取学员关联订单分页列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Student_OrderGuest_ViewModel> GetStuOrderGuestPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_OrderGuest_ViewModel query)
{
var list = student_OrderGuestRepository.GetStuOrderGuestPageRepository(pageIndex, pageSize, out rowsCount, query);
return list;
}
/// <summary>
/// 获取学员关联订单合同分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public object GetStuOrderGuestContractPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_OrderGuest_ViewModel query)
{
rowsCount = 0;
return null;
}
}
}
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
View file @ 6e5383ec
......@@ -60,5 +60,57 @@ WHERE 1=1
}
return Get<RB_Student_OrderGuest_ViewModel>(builder.ToString()).ToList();
}
/// <summary>
/// 获取学员关联订单分页列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Student_OrderGuest_ViewModel> GetStuOrderGuestPageRepository(int pageIndex,int pageSize,out long rowsCount, RB_Student_OrderGuest_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo,IFNULL(C.JoinType,0) AS StuJoinType,IFNULL(D.GuestState,0) AS StuGuestState
,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(B.ClassStatus,0) AS ClassStatus,IFNULL(D.RenewState,0) AS RenewState
,IFNULL(D.GuestName,'') AS GuestName,IFNULL(E.CourseName,'') AS CourseName
FROM RB_Student_OrderGuest AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
INNER JOIN rb_order AS C ON A.OrderId=C.OrderId
INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
INNER JOIN rb_course AS E ON c.CourseId=E.CourseId
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.ClassId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.ClassId), query.ClassId);
}
if (query.OrderId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.OrderId), query.OrderId);
}
if (query.GuestId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.GuestId), query.GuestId);
}
if (query.Student_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.Student_Id);
}
if (!string.IsNullOrEmpty(query.QStudentIds))
{
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);
}
}
return GetPage<RB_Student_OrderGuest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
}
}
}
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @ 6e5383ec
......@@ -2,6 +2,7 @@
using Edu.Common.API;
using Edu.Common.Plugin;
using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.User;
using Edu.Module.Customer;
using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors;
......@@ -308,5 +309,73 @@ namespace Edu.WebApi.Controllers.Customer
pageModel.PageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取学员关联订单分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStuOrderPage()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_OrderGuest_ViewModel()
{
Student_Id = base.ParmJObj.GetInt("StuId"),
};
//query.Group_Id = base.UserInfo.Group_Id;
var data = customerStudentModule.GetStuOrderGuestPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> list = new List<object>();
foreach (var item in data)
{
list.Add(new
{
item.OrderId,
item.Student_Id,
item.ClassName,
item.ClassNo,
item.TotalHours,
item.CompleteHours,
item.GuestName,
item.CourseName,
});
}
pageModel.Count = rowsCount;
pageModel.PageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取学员合同分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStuContractPage()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_OrderGuest_ViewModel()
{
Student_Id = base.ParmJObj.GetInt("StuId"),
};
//query.Group_Id = base.UserInfo.Group_Id;
var data = customerStudentModule.GetStuOrderGuestContractPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> list = new List<object>();
//foreach (var item in data)
//{
// list.Add(new
// {
// item.OrderId,
// item.Student_Id,
// item.ClassName,
// item.ClassNo,
// item.TotalHours,
// item.CompleteHours,
// item.GuestName,
// item.CourseName,
// });
//}
pageModel.Count = rowsCount;
pageModel.PageData = list;
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