Skip to content

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

页面修改

parent 2ac53412
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 23 deletions
Edu.Module.Course/OrderModule.cs
View file @ d02ebc33
...@@ -514,6 +514,7 @@ namespace Edu.Module.Course ...@@ -514,6 +514,7 @@ namespace Edu.Module.Course
message = "取消订单无法修改"; message = "取消订单无法修改";
return flag; return flag;
} }
#region 验证学生名单数量 #region 验证学生名单数量
var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { Group_Id = demodel.Group_Id, OrderId = demodel.OrderId, GuestState = 1 }); var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { Group_Id = demodel.Group_Id, OrderId = demodel.OrderId, GuestState = 1 });
if (glist.Count() > demodel.GuestNum) if (glist.Count() > demodel.GuestNum)
...@@ -523,6 +524,7 @@ namespace Edu.Module.Course ...@@ -523,6 +524,7 @@ namespace Edu.Module.Course
return flag; return flag;
} }
#endregion #endregion
Dictionary<string, object> keyValues = new Dictionary<string, object>() Dictionary<string, object> keyValues = new Dictionary<string, object>()
{ {
{ nameof(RB_Order_ViewModel.GuestNum),demodel.GuestNum}, { nameof(RB_Order_ViewModel.GuestNum),demodel.GuestNum},
...@@ -623,6 +625,62 @@ namespace Edu.Module.Course ...@@ -623,6 +625,62 @@ namespace Edu.Module.Course
{ {
SaleRemark = demodel.SaleRemark; SaleRemark = demodel.SaleRemark;
} }
#region 预约单转订单
//预约单转订单
if (flag && demodel.VisitorReserveId > 0)
{
string remark = userInfo.AccountName + "转订单";
Dictionary<string, object> visitorFileds = new Dictionary<string, object>()
{
{nameof(RB_Visitor_Reserve_Extend.ReserveStatus),1 },
{nameof(RB_Visitor_Reserve_Extend.Remark),remark },
{nameof(RB_Visitor_Reserve_Extend.OrderId),demodel.OrderId },
};
flag = visitor_ReserveRepository.Update(visitorFileds, new WhereHelper(nameof(RB_Visitor_Reserve_Extend.Id), demodel.VisitorReserveId));
var visitorModel = visitor_ReserveRepository.GetVisitorRepository(new RB_Visitor_Reserve_Extend() { Id = demodel.VisitorReserveId })?.FirstOrDefault();
var guestModel = new RB_Order_Guest_ViewModel()
{
Id = 0,
OrderId = demodel.OrderId,
ClassId = demodel.ClassId,
GuestName = visitorModel?.Name ?? "",
GuestState = 1,
Profession = "",
Sex = 1,
Age = 18,
Mobile = visitorModel?.Tel ?? "",
Basics = visitorModel?.LevelType,
Education = GuestEducationEnum.N2,
GuestSource = demodel.OrderSource,
LearningGoals = GuestLearningGoalsEnum.Love,
Contact = "",
ContactMobile = "",
Status = 0,
Group_Id = demodel.Group_Id,
School_Id = demodel.School_Id,
CreateBy = demodel.CreateBy,
CreateTime = demodel.CreateTime,
UpdateBy = demodel.UpdateBy,
UpdateTime = demodel.UpdateTime,
DropOutRemark = "",
IDCard = "",
Domicile = "",
ContactAddress = "",
SourceId = 0,
GraduatedSchool = "",
GraduatedMajor = "",
VolunteerMajor = "",
Price = 0,
StudyRemark = "",
TotalHours = Convert.ToInt32(courseModel.ClassHours),
CompleteHours = 0,
MakeUpHours = 0,
StuIcon = "",
};
SetOrderGuestInfo(guestModel, out string Nmessage);
}
#endregion
} }
#region 写日志 #region 写日志
...@@ -660,25 +718,6 @@ namespace Edu.Module.Course ...@@ -660,25 +718,6 @@ namespace Edu.Module.Course
} }
#endregion #endregion
#region 预约单转订单
//预约单转订单
if (flag && demodel.VisitorReserveId > 0)
{
string remark = userInfo.AccountName + "转订单";
Dictionary<string, object> visitorFileds = new Dictionary<string, object>()
{
{nameof(RB_Visitor_Reserve_Extend.ReserveStatus),1 },
{nameof(RB_Visitor_Reserve_Extend.Remark),remark },
{nameof(RB_Visitor_Reserve_Extend.OrderId),demodel.OrderId },
};
flag= visitor_ReserveRepository.Update(visitorFileds, new WhereHelper(nameof(RB_Visitor_Reserve_Extend.Id), demodel.VisitorReserveId));
var guestModel = new RB_Order_Guest_ViewModel();
//SetOrderGuestInfo(guestModel, out string Nmessage);
}
#endregion
return flag; return flag;
} }
......
Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs
View file @ d02ebc33
using Edu.Model.Entity.Duty; using Edu.Common.Enum;
using Edu.Model.Entity.Duty;
using Edu.Model.Entity.Reserve; using Edu.Model.Entity.Reserve;
using Edu.Model.ViewModel.Duty;
using Edu.Model.ViewModel.Reserve; using Edu.Model.ViewModel.Reserve;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -27,13 +29,14 @@ namespace Edu.Repository.Reserve ...@@ -27,13 +29,14 @@ namespace Edu.Repository.Reserve
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
var parameters = new DynamicParameters(); var parameters = new DynamicParameters();
builder.Append(@" builder.Append(@"
SELECT A.*,IFNULL(B.`Name`,'') AS VisitorName,C.ClassDate,C.ClassTime,C.ClassContent,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName SELECT A.*,IFNULL(B.`Name`,'') AS VisitorName,C.ClassDate,C.ClassTime,C.EndTime,C.ClassContent,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName
FROM RB_Visitor_Reserve AS A LEFT JOIN rb_visitor AS B ON A.Visitor_Id=B.Id FROM RB_Visitor_Reserve AS A LEFT JOIN rb_visitor AS B ON A.Visitor_Id=B.Id
LEFT JOIN rb_reserve_class AS C ON A.ReserveClassId=C.ReserveClassId LEFT JOIN rb_reserve_class AS C ON A.ReserveClassId=C.ReserveClassId
LEFT JOIN rb_teacher AS D ON C.TeacherId=D.TId LEFT JOIN rb_teacher AS D ON C.TeacherId=D.TId
LEFT JOIN rb_class_room AS E ON C.ClassRoomId=E.RoomId LEFT JOIN rb_class_room AS E ON C.ClassRoomId=E.RoomId
WHERE 1=1 WHERE 1=1
"); ");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.Status), (int)DateStateEnum.Normal);
if (query != null) if (query != null)
{ {
if (query.Group_Id > 0) if (query.Group_Id > 0)
...@@ -80,13 +83,15 @@ WHERE 1=1 ...@@ -80,13 +83,15 @@ WHERE 1=1
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
var parameters = new DynamicParameters(); var parameters = new DynamicParameters();
builder.Append(@" builder.Append(@"
SELECT A.*,IFNULL(B.`Name`,'') AS VisitorName,C.ClassDate,C.ClassTime,C.ClassContent,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName SELECT A.*,IFNULL(B.`Name`,'') AS VisitorName,C.ClassDate,C.ClassTime,C.EndTime,C.ClassContent,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName
FROM RB_Visitor_Reserve AS A LEFT JOIN rb_visitor AS B ON A.Visitor_Id=B.Id FROM RB_Visitor_Reserve AS A LEFT JOIN rb_visitor AS B ON A.Visitor_Id=B.Id
LEFT JOIN rb_reserve_class AS C ON A.ReserveClassId=C.ReserveClassId LEFT JOIN rb_reserve_class AS C ON A.ReserveClassId=C.ReserveClassId
LEFT JOIN rb_teacher AS D ON C.TeacherId=D.TId LEFT JOIN rb_teacher AS D ON C.TeacherId=D.TId
LEFT JOIN rb_class_room AS E ON C.ClassRoomId=E.RoomId LEFT JOIN rb_class_room AS E ON C.ClassRoomId=E.RoomId
WHERE 1=1 WHERE 1=1
"); if (query != null) ");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{ {
if (query.Group_Id > 0) if (query.Group_Id > 0)
{ {
...@@ -143,5 +148,35 @@ WHERE 1=1 {0} ...@@ -143,5 +148,35 @@ WHERE 1=1 {0}
GROUP BY A.ReserveClassId ", builder.ToString()); GROUP BY A.ReserveClassId ", builder.ToString());
return Get<RB_Visitor_Reserve_Extend>(sql, parameters).ToList(); return Get<RB_Visitor_Reserve_Extend>(sql, parameters).ToList();
} }
/// <summary>
/// 根据约课信息获取访客列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Visitor_ViewModel> GetVisitorRepository(RB_Visitor_Reserve_Extend query)
{
StringBuilder builder = new StringBuilder();
var parameters = new DynamicParameters();
builder.Append(@"
SELECT B.*
FROM RB_Visitor_Reserve AS A INNER JOIN rb_visitor AS B ON A.Visitor_Id=B.Id
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.Group_Id), query.Group_Id);
}
if (query.Id > 0)
{
builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Visitor_Reserve_Extend.Id), query.Id);
}
}
return Get<RB_Visitor_ViewModel>(builder.ToString(), parameters).ToList();
}
} }
} }
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