Skip to content

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

页面修改

parent d8877275
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 12 deletions
Edu.Model/Entity/Course/RB_Order.cs
View file @ b13e8dc8
...@@ -214,5 +214,20 @@ namespace Edu.Model.Entity.Course ...@@ -214,5 +214,20 @@ namespace Edu.Model.Entity.Course
/// 是否插班报入 /// 是否插班报入
/// </summary> /// </summary>
public int IsChaBan { get; set; } public int IsChaBan { get; set; }
/// <summary>
/// 生效时间
/// </summary>
public DateTime EffectTime { get; set; }
/// <summary>
/// 生效状态(0-未生效，1-生效中，2-完成)
/// </summary>
public int EffectStatus { get; set; }
/// <summary>
/// 前置订单编号
/// </summary>
public int UpOrderId { get; set; }
} }
} }
Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs
View file @ b13e8dc8
...@@ -104,5 +104,6 @@ namespace Edu.Model.ViewModel.Course ...@@ -104,5 +104,6 @@ namespace Edu.Model.ViewModel.Course
/// 是否插班报入(1-是) /// 是否插班报入(1-是)
/// </summary> /// </summary>
public int IsChaBan { get; set; } public int IsChaBan { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/ClassModule.cs
View file @ b13e8dc8
...@@ -1090,6 +1090,9 @@ namespace Edu.Module.Course ...@@ -1090,6 +1090,9 @@ namespace Edu.Module.Course
ClassHours = classModel?.ClassHours ?? 0, ClassHours = classModel?.ClassHours ?? 0,
IsRenew = courseModel?.IsRenew ?? 0, IsRenew = courseModel?.IsRenew ?? 0,
CheckStatus = checkStatus, CheckStatus = checkStatus,
item.IsChaBan,
item.StartClassHours,
item.CourseName,
}); });
} }
} }
......
Edu.Module.Course/OrderModule.cs
View file @ b13e8dc8
...@@ -448,6 +448,21 @@ namespace Edu.Module.Course ...@@ -448,6 +448,21 @@ namespace Edu.Module.Course
} }
if (demodel.OrderId > 0) if (demodel.OrderId > 0)
{ {
if (orderModel.EffectStatus != 2)
{
if (demodel.EffectTime > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
{
demodel.EffectStatus = 1;
}
else
{
demodel.EffectStatus = 0;
}
}
else
{
demodel.EffectStatus = orderModel.EffectStatus;
}
if (orderModel == null) if (orderModel == null)
{ {
flag = false; flag = false;
...@@ -483,6 +498,9 @@ namespace Edu.Module.Course ...@@ -483,6 +498,9 @@ namespace Edu.Module.Course
{ nameof(RB_Order_ViewModel.LessPrice),demodel.LessPrice}, { nameof(RB_Order_ViewModel.LessPrice),demodel.LessPrice},
{ nameof(RB_Order_ViewModel.StartClassHours),demodel.StartClassHours}, { nameof(RB_Order_ViewModel.StartClassHours),demodel.StartClassHours},
{ nameof(RB_Order_ViewModel.CourseId),demodel.CourseId}, { nameof(RB_Order_ViewModel.CourseId),demodel.CourseId},
{ nameof(RB_Order_ViewModel.EffectStatus),demodel.EffectStatus},
{ nameof(RB_Order_ViewModel.EffectTime),demodel.EffectTime},
{ nameof(RB_Order_ViewModel.UpOrderId),demodel.UpOrderId},
}; };
flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId)); flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId));
if (flag) if (flag)
...@@ -555,6 +573,14 @@ namespace Edu.Module.Course ...@@ -555,6 +573,14 @@ namespace Edu.Module.Course
} }
else else
{ {
if (demodel.EffectTime > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
{
demodel.EffectStatus = 1;
}
else
{
demodel.EffectStatus = 0;
}
if (classModel.ClassStatus == Common.Enum.Course.ClassStatusEnum.EndClass || classModel.ClassStatus == Common.Enum.Course.ClassStatusEnum.CancelClass) if (classModel.ClassStatus == Common.Enum.Course.ClassStatusEnum.EndClass || classModel.ClassStatus == Common.Enum.Course.ClassStatusEnum.CancelClass)
{ {
flag = false; flag = false;
...@@ -988,6 +1014,30 @@ namespace Edu.Module.Course ...@@ -988,6 +1014,30 @@ namespace Edu.Module.Course
return orderList; return orderList;
} }
/// <summary>
/// 获取班级订单列表
/// </summary>
/// <param name="classId"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public List<RB_Order_ViewModel> GetClassOrderListExtModule(int classId, int groupId)
{
//获取订单列表
var orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = groupId, ClassId = classId, OrderState = OrderStateEnum.Normal });
var guestList = new List<RB_Order_Guest_ViewModel>();
if (orderList != null && orderList.Count > 0)
{
string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
//获取名单列表
guestList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
}
foreach (var item in orderList)
{
item.GuestList = guestList.Where(x => x.OrderId == item.OrderId).ToList();
}
return orderList;
}
/// <summary> /// <summary>
/// 设置订单使用最新的班级价格 /// 设置订单使用最新的班级价格
/// </summary> /// </summary>
......
Edu.Repository/Course/RB_Order_GuestRepository.cs
View file @ b13e8dc8
...@@ -21,45 +21,49 @@ namespace Edu.Repository.Course ...@@ -21,45 +21,49 @@ namespace Edu.Repository.Course
/// <returns></returns> /// <returns></returns>
public List<RB_Order_Guest_ViewModel> GetList(RB_Order_Guest_ViewModel demodel) public List<RB_Order_Guest_ViewModel> GetList(RB_Order_Guest_ViewModel demodel)
{ {
string where = $@" 1=1 and Status=0"; string where = $@" 1=1 and A.Status=0";
if (demodel.Group_Id > 0) if (demodel.Group_Id > 0)
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
} }
if (demodel.School_Id > 0) if (demodel.School_Id > 0)
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
} }
if (demodel.Id > 0) if (demodel.Id > 0)
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
} }
if (demodel.OrderId > 0) if (demodel.OrderId > 0)
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
} }
if (demodel.ClassId > 0) if (demodel.ClassId > 0)
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
} }
if (!string.IsNullOrEmpty(demodel.OrderIds)) if (!string.IsNullOrEmpty(demodel.OrderIds))
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})";
} }
if (!string.IsNullOrEmpty(demodel.ClassIds)) if (!string.IsNullOrEmpty(demodel.ClassIds))
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} in({demodel.ClassIds})"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.ClassId)} in({demodel.ClassIds})";
} }
if (!string.IsNullOrEmpty(demodel.GuestName)) if (!string.IsNullOrEmpty(demodel.GuestName))
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
} }
if (demodel.GuestState > 0) if (demodel.GuestState > 0)
{ {
where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
} }
string sql = $@" select * from RB_Order_Guest where {where}"; string sql = $@"
SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
LEFT JOIN rb_course AS C ON B.CourseId=C.CourseId
WHERE {where}";
return Get<RB_Order_Guest_ViewModel>(sql).ToList(); return Get<RB_Order_Guest_ViewModel>(sql).ToList();
} }
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ b13e8dc8
...@@ -343,6 +343,33 @@ namespace Edu.WebApi.Controllers.Course ...@@ -343,6 +343,33 @@ namespace Edu.WebApi.Controllers.Course
}); });
} }
/// <summary>
/// 获取班级订单下拉列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSelectClassOrderList()
{
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
var userInfo = base.UserInfo;
int ClassId = parms.GetInt("ClassId", 0);
if (ClassId <= 0)
{
return ApiResult.ParamIsNull();
}
var orderList = orderModule.GetClassOrderListExtModule(ClassId, userInfo.Group_Id);
return ApiResult.Success("", orderList.Select(x => new
{
x.OrderId,
x.ClassId,
x.ClassName,
x.CourseId,
x.CourseName,
x.GuestList,
}));
}
/// <summary> /// <summary>
/// 新增修改订单 /// 新增修改订单
/// </summary> /// </summary>
...@@ -372,7 +399,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -372,7 +399,10 @@ namespace Edu.WebApi.Controllers.Course
CourseId = base.ParmJObj.GetInt("CourseId"), CourseId = base.ParmJObj.GetInt("CourseId"),
StartClassHours = base.ParmJObj.GetInt("StartClassHours"), StartClassHours = base.ParmJObj.GetInt("StartClassHours"),
IsChaBan=base.ParmJObj.GetInt("IsChaBan"), IsChaBan=base.ParmJObj.GetInt("IsChaBan"),
EffectTime=base.ParmJObj.GetDateTime("EffectTime"),
UpOrderId=base.ParmJObj.GetInt("UpOrderId"),
}; };
if (demodel.OrderType == OrderTypeEnum.CourseOrder && demodel.ClassId <= 0) if (demodel.OrderType == OrderTypeEnum.CourseOrder && demodel.ClassId <= 0)
{ {
return ApiResult.ParamIsNull("请传递班级id"); return ApiResult.ParamIsNull("请传递班级id");
...@@ -505,6 +535,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -505,6 +535,8 @@ namespace Edu.WebApi.Controllers.Course
model.IsChaBan, model.IsChaBan,
model.CourseId, model.CourseId,
model.StartClassHours, model.StartClassHours,
EffectTime = Common.ConvertHelper.FormatDate(model.EffectTime),
model.UpOrderId,
}, },
StepPriceList = list.Select(x => new StepPriceList = list.Select(x => new
{ {
...@@ -512,7 +544,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -512,7 +544,7 @@ namespace Edu.WebApi.Controllers.Course
x.PersionNum, x.PersionNum,
x.PersionPrice x.PersionPrice
}) })
}); }); ;
} }
/// <summary> /// <summary>
......
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