Skip to content

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

页面修改

parent d0fb9dda
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 137 deletions
Edu.Common/Enum/Course/GuestStateEnum.cs 0 → 100644
View file @ 794e7ead
using Edu.Common.Plugin;
namespace Edu.Common.Enum.Course
{
/// <summary>
/// 学员状态枚举
/// </summary>
public enum GuestStateEnum
{
/// <summary>
///正常
/// </summary>
[EnumField("正常")]
Normal = 1,
/// <summary>
///退学
/// </summary>
[EnumField("退学")]
DropOut =2,
/// <summary>
///退学申请中
/// </summary>
[EnumField("退学申请中")]
DropOutApplyIng = 3,
/// <summary>
///驳回申请
/// </summary>
[EnumField("驳回申请")]
RejectApply =4,
/// <summary>
///停课
/// </summary>
[EnumField("停课")]
StopClasses =5,
/// <summary>
/// 停课申请中
/// </summary>
[EnumField("停课申请中")]
StopClassesApplyIng =6,
/// <summary>
/// 毕业
/// </summary>
[EnumField("毕业")]
Graduate =7,
/// <summary>
/// 转班申请中
/// </summary>
[EnumField("转班申请中")]
TransferClassesApplyIng =8,
/// <summary>
/// 分拆申请中
/// </summary>
[EnumField("分拆申请中")]
SplitApplyIng =9,
}
}
Edu.Model/Entity/Course/RB_Course.cs
View file @ 794e7ead
using Edu.Common.Enum;
using Edu.Common.Enum.Course;
using System;
using VT.FW.DB;
......@@ -135,5 +136,10 @@ namespace Edu.Model.Entity.Course
/// 甲鹤小程序商品id
/// </summary>
public int MallGoodsId { get; set; }
/// <summary>
/// 课程等级
/// </summary>
public CourseRateEnum CourseRate { get; set; }
}
}
\ No newline at end of file
Edu.Model/Entity/Sell/RB_Order_Guest.cs
View file @ 794e7ead
......@@ -13,9 +13,10 @@ namespace Edu.Model.Entity.Sell
public class RB_Order_Guest
{
/// <summary>
/// id
/// 主键编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 订单编号
/// </summary>
......@@ -32,9 +33,9 @@ namespace Edu.Model.Entity.Sell
public string GuestName { get; set; }
/// <summary>
/// 状态 1正常 2退学 3-申请中，4-驳回申请,5-停课，6-停课申请中，7-毕业，8-转班申请中，9-分拆申请
/// 状态(参考枚举)
/// </summary>
public int GuestState { get; set; }
public GuestStateEnum GuestState { get; set; }
/// <summary>
/// 职业
......@@ -220,5 +221,10 @@ namespace Edu.Model.Entity.Sell
/// 合同链接
/// </summary>
public string ContractUrl { get; set; }
/// <summary>
/// 学员毕业时间
/// </summary>
public DateTime? GraduationTime { get; set; }
}
}
Edu.Model/ViewModel/Sell/RB_Order_Guest_Extend.cs
View file @ 794e7ead
using System;
using Edu.Common.Plugin;
using Edu.Model.Entity.Sell;
namespace Edu.Model.ViewModel.Sell
......@@ -134,19 +135,7 @@ namespace Edu.Model.ViewModel.Sell
{
get
{
string str = "";
switch (this.GuestState)
{
case 1: str = "正常"; break;
case 2: str = "退学"; break;
case 3: str = "申请退学中"; break;
case 4: str = "驳回申请"; break;
case 5: str = "停课"; break;
case 6: str = "停课申请中"; break;
case 7: str = "完结"; break;
case 8: str = "转班申请中"; break;
}
return str;
return this.GuestState.ToName();
}
}
......
Edu.Model/ViewModel/Sell/RB_Order_Guest_ViewModel.cs
View file @ 794e7ead
using Edu.Common.Enum.Sale;
using Edu.Common.Plugin;
using Edu.Model.Entity.Sell;
using System;
using System.Collections.Generic;
......@@ -76,20 +77,7 @@ namespace Edu.Model.ViewModel.Sell
{
get
{
string str = "";
switch (this.GuestState)
{
case 1: str = "正常"; break;
case 2: str = "退学"; break;
case 3: str = "申请退学中"; break;
case 4: str = "驳回申请"; break;
case 5: str = "停课"; break;
case 6: str = "停课申请中"; break;
case 7: str = "完结"; break;
case 8: str = "转班申请中"; break;
case 9: str = "分拆申请中"; break;
}
return str;
return this.GuestState.ToName();
}
}
......
Edu.Module.Course/ClassModule.cs
View file @ 794e7ead
This diff is collapsed.
Edu.Module.Course/CourseModule.cs
View file @ 794e7ead
......@@ -294,6 +294,7 @@ namespace Edu.Module.Course
{nameof(RB_Course_ViewModel.Saleplat),model.Saleplat },
{nameof(RB_Course_ViewModel.IsKCourse),model.IsKCourse },
{nameof(RB_Course_ViewModel.ClassHours),model.ClassHours },
{nameof(RB_Course_ViewModel.CourseRate),model.CourseRate },
};
flag = courseRepository.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), model.CourseId));
}
......
Edu.Module.Course/OrderModule.cs
View file @ 794e7ead
......@@ -181,26 +181,6 @@ namespace Edu.Module.Course
/// </summary>
private readonly RB_Order_SplitDetailsRepository splitDetailsRepository = new RB_Order_SplitDetailsRepository();
/// <summary>
/// 小程序对应的商品仓储对象
/// </summary>
private readonly Repository.Mall.RB_GoodsRepository mallGoodsRepository = new Repository.Mall.RB_GoodsRepository();
/// <summary>
/// 小程序对应的商品分类仓储对象
/// </summary>
private readonly Repository.Mall.RB_Goods_CategoryRepository MallGoodsCategoryRepository = new Repository.Mall.RB_Goods_CategoryRepository();
/// <summary>
/// 小程序对应的商品优惠仓储对象
/// </summary>
private readonly Repository.Mall.RB_Goods_PreferentialRepository MallGoodsPreferentialRepository = new Repository.Mall.RB_Goods_PreferentialRepository();
/// <summary>
/// 商品规格
/// </summary>
private readonly Repository.Mall.RB_Goods_SpecificationRepository goods_SpecificationRepository = new Repository.Mall.RB_Goods_SpecificationRepository();
/// <summary>
/// 商品规格值
/// </summary>
......@@ -636,7 +616,7 @@ namespace Edu.Module.Course
}
#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 = GuestStateEnum.Normal });
if (glist.Count() > demodel.GuestNum)
{
flag = false;
......@@ -779,7 +759,7 @@ namespace Edu.Module.Course
OrderId = demodel.OrderId,
ClassId = demodel.ClassId,
GuestName = visitorModel?.Name ?? "",
GuestState = 1,
GuestState = GuestStateEnum.Normal,
Profession = "",
Sex = 1,
Age = 18,
......@@ -826,7 +806,7 @@ namespace Edu.Module.Course
OrderId = demodel.OrderId,
ClassId = demodel.ClassId,
GuestName = oldGuestModel?.GuestName ?? "",
GuestState = 1,
GuestState = GuestStateEnum.Normal,
Profession = oldGuestModel?.Profession ?? "",
Sex = oldGuestModel?.Sex ?? 1,
Age = oldGuestModel?.Age ?? 18,
......@@ -1340,8 +1320,10 @@ namespace Edu.Module.Course
#region 更新甲鹤小程序规格对应的库存
if (flag && orderModel.JoinType != OrderJoinTypeEnum.RenewOrder)//续费订单不去更新规格库存
{
List<int> classId = new List<int>();
classId.Add(orderModel.ClassId);
List<int> classId = new List<int>
{
orderModel.ClassId
};
System.Threading.Tasks.Task.Run(() => UpdateGoodsSpecification(classId));
}
#endregion
......@@ -2089,7 +2071,7 @@ namespace Edu.Module.Course
}
dmodel.ClassId = ordermodel.ClassId;
dmodel.SourceId = ordermodel.SourceId;
int GuestNum = order_GuestRepository.GetOrderGuestNumRepository(new RB_Order_Guest_ViewModel() { OrderId = dmodel.OrderId, GuestState = 1 });
int GuestNum = order_GuestRepository.GetOrderGuestNumRepository(new RB_Order_Guest_ViewModel() { OrderId = dmodel.OrderId, GuestState = GuestStateEnum.Normal });
if (GuestNum >= ordermodel.GuestNum)
{
message = "学生名单已录入完毕";
......@@ -2804,7 +2786,7 @@ namespace Edu.Module.Course
string LogContent = "";
if (gmodel.CompleteHours <= validClassHours)
{
keyValues.Add(nameof(RB_Order_Guest.GuestState), 1);
keyValues.Add(nameof(RB_Order_Guest.GuestState), (int)GuestStateEnum.Normal);
keyValues.Add(nameof(RB_Order_Guest.DropOutRemark), "有效课时大于完成课时,恢复学员状态!");
LogContent = gmodel.GuestName + "有效课时大于完成课时,系统恢复学员状态!";
}
......
Edu.Module.Course/OrderModule2.cs
View file @ 794e7ead
......@@ -17,6 +17,7 @@ using Edu.Repository.Contract;
using Edu.Model.Entity.Contract;
using Edu.Model.Entity.Course;
using Edu.Model.ViewModel.Contract;
using Edu.Common.Enum.Course;
namespace Edu.Module.Course
{
......@@ -176,7 +177,7 @@ namespace Edu.Module.Course
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Order_Guest_ViewModel.GuestState),3 }
{nameof(RB_Order_Guest_ViewModel.GuestState),(int)GuestStateEnum.DropOutApplyIng}
};
flag = order_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), GuestId));
}
......
Edu.Module.Course/SellCommissionModule.cs
View file @ 794e7ead
......@@ -732,7 +732,7 @@ namespace Edu.Module.Course
#region 班级提成
//查询是否订单下所有学员都已退学
var g2list = glist.Where(x => x.OrderId == item.OrderId).ToList();
if (g2list.Where(x => x.GuestState == -1).Count() == item.GuestNum)
if (g2list.Where(x => x.GuestState == GuestStateEnum.DropOut).Count() == item.GuestNum)
{
//所有学生都退学了 直接计算提成 全部一次性发放
if (item.HelpEnterId > 0)
......@@ -2022,7 +2022,7 @@ namespace Edu.Module.Course
#region 班级提成
//查询是否订单下所有学员都已退学
var g2list = glist.Where(x => x.OrderId == item.OrderId).ToList();
if (g2list.Where(x => x.GuestState == -1).Count() == item.GuestNum)
if (g2list.Where(x => x.GuestState == GuestStateEnum.DropOut).Count() == item.GuestNum)
{
//所有学生都退学了 直接计算提成 全部一次性发放
if (item.HelpEnterId > 0)
......
Edu.Module.Course/StudentBillModule.cs
View file @ 794e7ead
......@@ -170,7 +170,7 @@ namespace Edu.Module.Course
if (backModel == null || backModel.AuditStatus != WFRrocessStatus.AuditThrough) { return "退课流程未审核通过"; }
if (backModel.FinanceId > 0) { return "已制单，无法再次生成财务单据"; }
var guestModel = order_GuestRepository.GetEntity(backModel.GuestId);
if (guestModel == null || guestModel.GuestState != 2) { return "客人名单状态不正确"; }
if (guestModel == null || guestModel.GuestState != GuestStateEnum.DropOut) { return "客人名单状态不正确"; }
var fcmodel = finance_ConfigRepository.GetList(new RB_Finance_Config_ViewModel() { Group_Id = userInfo.Group_Id, Type = FinanceConfigTypeEnum.DropCourse }).FirstOrDefault();
if (fcmodel == null) { return "未配置制单流程"; }
......
Edu.Module.EduTask/OrderChangeModule.cs
View file @ 794e7ead
......@@ -131,7 +131,7 @@ namespace Edu.Module.EduTask
flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out message);
Dictionary<string, object> guestFileds = new Dictionary<string, object>()
{
{nameof(RB_Order_Guest_ViewModel.GuestState),8}
{nameof(RB_Order_Guest_ViewModel.GuestState),(int)GuestStateEnum.TransferClassesApplyIng}
};
if (flag)
{
......@@ -325,7 +325,7 @@ namespace Edu.Module.EduTask
Dictionary<string, object> guestFileds = new Dictionary<string, object>()
{
{nameof(RB_Order_Guest_ViewModel.TotalHours),guestClassHours.FinishClassHours },
{nameof(RB_Order_Guest_ViewModel.GuestState),7 },
{nameof(RB_Order_Guest_ViewModel.GuestState),(int)GuestStateEnum.Graduate },
};
if (flag)
{
......@@ -1007,7 +1007,7 @@ namespace Edu.Module.EduTask
Dictionary<string, object> newGuestFileds = new Dictionary<string, object>()
{
{nameof(RB_Order_Guest_Extend.TotalHours),guest.CompleteHours },
{nameof(RB_Order_Guest_Extend.GuestState),7 }
{nameof(RB_Order_Guest_Extend.GuestState),(int)GuestStateEnum.Graduate}
};
flag = guestRepository.Update(newGuestFileds, new WhereHelper(nameof(RB_Order_Guest_Extend.Id), guest.Id));
#endregion
......
Edu.Module.EduTask/StopStudentClassModule.cs
View file @ 794e7ead
using Edu.Model.Entity.Course;
using Edu.Common.Enum.Course;
using Edu.Model.Entity.Course;
using Edu.Model.Entity.EduTask;
using Edu.Model.Entity.Sell;
using Edu.Model.ViewModel.EduTask;
......@@ -50,13 +51,13 @@ namespace Edu.Module.EduTask
/// <returns></returns>
public bool UpdateAuditThroughStudent()
{
var list = order_GuestRepository.GetOrderStopClassing(new RB_Order_Guest_ViewModel { GuestState = 6 });
var list = order_GuestRepository.GetOrderStopClassing(new RB_Order_Guest_ViewModel { GuestState = Common.Enum.Course.GuestStateEnum.StopClassesApplyIng });
foreach (var item in list.Where(x => x.StopClassEffectTime.HasValue && x.StopClassEffectTime < System.DateTime.Now))
{
//将学员的学习状态变成停课申请中
//将学员的学习状态变成停课申
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Order_Guest.GuestState),5},
{nameof(RB_Order_Guest.GuestState),(int)GuestStateEnum.StopClasses},
{nameof(RB_Order_Guest.ChangeEffectTime),item.StopClassEffectTime},
{nameof(RB_Order_Guest.UpdateTime),System.DateTime.Now},
};
......@@ -97,7 +98,7 @@ namespace Edu.Module.EduTask
//将学员的学习状态变成停课申请中
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Order_Guest.GuestState),6},
{nameof(RB_Order_Guest.GuestState),(int)GuestStateEnum.StopClassesApplyIng},
};
flag = order_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_Order_Guest.Id), extModel.OrderGuestId));
var educationReceipt = new RB_Education_Receipt()
......
Edu.Module.Question/AnalysisQuestionTypeModule.cs
View file @ 794e7ead
......@@ -14,7 +14,7 @@ namespace Edu.Module.Question
/// <summary>
/// 字母选项数组
/// </summary>
private static string [] LetterArray= new string[26] { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
private static readonly string [] LetterArray= new string[26] { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
/// <summary>
/// 问题解析
......
Edu.Repository/BackClass/RB_Student_BackClassRepository.cs
View file @ 794e7ead
......@@ -141,7 +141,7 @@ WHERE 1=1 ");
if (flag)
{
var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
if (guestList != null && guestList.Where(qitem => qitem.GuestState == 2).Count() == guestList.Count())
if (guestList != null && guestList.Where(qitem => qitem.GuestState == GuestStateEnum.DropOut).Count() == guestList.Count())
{
//更新订单为退学状态
Dictionary<string, object> orderFileds = new Dictionary<string, object>()
......
Edu.Repository/EduTask/RB_Student_LeaveRepository.cs
View file @ 794e7ead
......@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Web;
using Edu.Common;
using Edu.Common.Enum.Course;
using Edu.Common.Enum.System;
using Edu.Model.Entity.EduTask;
using Edu.Model.Entity.Sell;
......@@ -175,6 +176,7 @@ namespace Edu.Repository.EduTask
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "UpdateStundetLeave");
}
}
var signModel = checkLogList?.Where(qitem => qitem.ClassTimeId == item.ClassTimeId && qitem.ClassId == item.ClassId && qitem.OrderGuestId == model.OrderGuestId)?.FirstOrDefault();
......@@ -276,7 +278,7 @@ namespace Edu.Repository.EduTask
//已上课时>=有效课时，如果是，修改学员状态为停课，并且备注“有效课时消耗完毕，系统自动停课”
if (completeHours > guestModel.ValidClassHours)
{
orderFileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState), 5);
orderFileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState),(int)GuestStateEnum.StopClasses);
orderFileds.Add(nameof(RB_Order_Guest_ViewModel.ChangeEffectTime), DateTime.Now);
orderFileds.Add(nameof(RB_Order_Guest_ViewModel.DropOutRemark), "有效课时消耗完毕，系统自动停课");
LogContent = guestModel.GuestName + "有效课时消耗完毕，系统自动停课!";
......@@ -607,7 +609,7 @@ namespace Edu.Repository.EduTask
public bool CalcGuestHoursModule(RB_Order_Guest guestModel, RB_Class_Check_ViewModel checkModel, RB_Order orderModel, RB_Class_ViewModel classModel, Model.ViewModel.User.RB_Account_ViewModel sellerInfo)
{
bool flag = true;
if (guestModel.GuestState == 1)
if (guestModel.GuestState == GuestStateEnum.Normal)
{
decimal NoFinishHours = 0;
//获取以前所有签到列表【倒叙】
......@@ -633,14 +635,12 @@ namespace Edu.Repository.EduTask
//缺勤课时超过12课时更新学员状态为【停课】
if (NoFinishHours >= Common.Config.AbsentHours)
{
fileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState), 5);
fileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState), (int)GuestStateEnum.StopClasses);
checkFileds.Add(nameof(RB_Class_Check_ViewModel.IsAbsentHours), 1);
checkFileds.Add(nameof(RB_Class_Check_ViewModel.MakeUpStatus), 4);
// var orderModel = orderRepository.GetEntity(guestModel.OrderId);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
// var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
// var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 欠费提醒（销售）
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
......
Edu.Repository/Sell/RB_Order_GuestRepository.cs
View file @ 794e7ead
......@@ -116,7 +116,7 @@ namespace Edu.Repository.Sell
}
if (demodel.GuestState > 0)
{
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}";
}
if (demodel.QEffectStatus == 1)
{
......@@ -185,7 +185,7 @@ WHERE 1=1 AND A.Status=0
}
if (demodel.GuestState > 0)
{
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}");
}
return GetPage<RB_Order_Guest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
}
......@@ -225,7 +225,7 @@ WHERE 1=1 AND A.Status=0
}
if (demodel.GuestState > 0)
{
where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}";
}
string sql = $@" select count(0) from RB_Order_Guest where {where}";
var obj = ExecuteScalar(sql);
......@@ -286,7 +286,7 @@ WHERE 1=1 AND A.Status=0
}
if (demodel.GuestState > 0)
{
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}";
}
string sql = $@"
SELECT A.*,IFNULL(B.StartClassHours,0) AS StartClassHours
......@@ -361,7 +361,7 @@ WHERE 1=1 and A.Status=0 and class.Status=0 and b.OrderState<>3
if (demodel.GuestState > 0)
{
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}");
}
builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
return GetPage<RB_Order_Guest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
......@@ -431,7 +431,7 @@ WHERE 1=1 and A.Status=0 and class.Status=0 and b.OrderState<>3 ");
}
if (demodel.GuestState > 0)
{
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}");
}
builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
return Get<RB_Order_Guest_ViewModel>(builder.ToString()).ToList();
......@@ -504,7 +504,7 @@ WHERE 1=1 and A.Status=0 and class.Status=0 and b.OrderState<>3 and a.Guest
}
if (demodel.GuestState > 0)
{
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}");
}
builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
return Get<RB_Order_Guest_ViewModel>(builder.ToString()).ToList();
......@@ -552,7 +552,7 @@ WHERE 1=1 and A.Status=0 and class.Status=0 and b.OrderState<>3 and a.Guest
}
if (demodel.GuestState > 0)
{
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}";
}
if (demodel.QEffectStatus == 1)
{
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 794e7ead
......@@ -984,7 +984,7 @@ namespace Edu.WebApi.Controllers.Course
List<object> guestList = new List<object>();
//|| x.GuestState == 6[去掉退课申请中的]
foreach (var item in orderGuestList.Where(x => x.GuestState == 1 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= data.ClassDate)))
foreach (var item in orderGuestList.Where(x => x.GuestState == GuestStateEnum.Normal || ((x.GuestState == GuestStateEnum.StopClasses || x.GuestState == GuestStateEnum.Graduate) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= data.ClassDate)))
{
if (item.JoinType == Common.Enum.Sale.OrderJoinTypeEnum.InsertClass && data.ClassDate >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime)))
{
......@@ -1053,7 +1053,7 @@ namespace Edu.WebApi.Controllers.Course
}
foreach (var item in tempGuestList)
{
if (item.GuestState == 1 || item.GuestState == 6 || ((item.GuestState == 5 || item.GuestState == 7) && item.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ChangeEffectTime)) >= data.ClassDate))
if (item.GuestState == GuestStateEnum.Normal || item.GuestState == GuestStateEnum.StopClassesApplyIng || ((item.GuestState == GuestStateEnum.StopClasses || item.GuestState == GuestStateEnum.Graduate) && item.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ChangeEffectTime)) >= data.ClassDate))
{
guestList.Add(new
{
......@@ -1128,7 +1128,7 @@ namespace Edu.WebApi.Controllers.Course
{
model.Age = System.DateTime.Now.Year - Convert.ToDateTime(model.BirthDay).Year;
}
model.GuestState = 1;
model.GuestState = GuestStateEnum.Normal;
model.GuestSource = OrderSourceEnum.Employee;
model.CreateBy = base.UserInfo.Id;
model.UpdateBy = base.UserInfo.Id;
......@@ -1203,10 +1203,6 @@ namespace Edu.WebApi.Controllers.Course
//获取班级的学员信息
var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, QEffectStatus = 1 });
if (list.Count() != orderGuestList.Where(x => x.GuestState == 1).Count())
{
// return ApiResult.Failed("签到总人数错误，请先检查信息");
}
//判断今天有课没有
var planList = classModule.GetClassPlanEntityModule(new RB_Class_Plan_ViewModel
......
Edu.WebApi/Controllers/Course/ClassRoomController.cs
View file @ 794e7ead
......@@ -5,6 +5,7 @@ using System.Threading.Tasks;
using Edu.Cache.User;
using Edu.Common.API;
using Edu.Common.Enum;
using Edu.Common.Enum.Course;
using Edu.Common.Plugin;
using Edu.Model.ViewModel.Course;
using Edu.Model.ViewModel.Grade;
......@@ -506,12 +507,12 @@ namespace Edu.WebApi.Controllers.Course
var tempOrderGuestList = classModule.GetTempInvitationGuest(new Model.ViewModel.EduTask.RB_Temporary_Invitation_ViewModel {ClassTimeId=ID ,ClassId=classModel.ClassId});
var allOrderGuestList = new List<RB_Order_Guest_ViewModel>();
allOrderGuestList.AddRange(orderGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(timeModel.NewPlanDateTime)))));
allOrderGuestList.AddRange(orderGuestList.Where(x => x.GuestState ==GuestStateEnum.Normal || x.GuestState == GuestStateEnum.StopClassesApplyIng || ((x.GuestState == GuestStateEnum.StopClasses || x.GuestState == GuestStateEnum.Graduate) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(timeModel.NewPlanDateTime)))));
var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { ClassTimeId = ID, Group_Id = base.UserInfo.Group_Id, School_Id = -1, ClassId = classModel.ClassId });
if (tempOrderGuestList != null&& tempOrderGuestList.Any())
{
allOrderGuestList.AddRange(tempOrderGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) &&x.ClassTimeId==ID&&x.ClassId==classModel.ClassId && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(timeModel.NewPlanDateTime)))));
allOrderGuestList.AddRange(tempOrderGuestList.Where(x => x.GuestState == GuestStateEnum.Normal || x.GuestState == GuestStateEnum.StopClassesApplyIng || ((x.GuestState == GuestStateEnum.StopClasses || x.GuestState == GuestStateEnum.Graduate) &&x.ClassTimeId==ID&&x.ClassId==classModel.ClassId && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(timeModel.NewPlanDateTime)))));
}
foreach (var item in allOrderGuestList)
......
Edu.WebApi/Controllers/Course/CourseController.cs
View file @ 794e7ead
......@@ -281,7 +281,8 @@ namespace Edu.WebApi.Controllers.Course
RenewSlPrice = base.ParmJObj.GetDecimal("RenewSlPrice"),
Saleplat = base.ParmJObj.GetStringValue("Saleplat"),
IsKCourse = base.ParmJObj.GetInt("IsKCourse"),
ClassHours = base.ParmJObj.GetDecimal("ClassHours")
ClassHours = base.ParmJObj.GetDecimal("ClassHours"),
CourseRate = (CourseRateEnum)base.ParmJObj.GetInt("CourseRate"),
};
try
{
......@@ -296,7 +297,7 @@ namespace Edu.WebApi.Controllers.Course
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SetCourse");
}
extModel.CreateTime = DateTime.Now;
extModel.CreateBy = base.UserInfo.Id;
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 794e7ead
......@@ -1038,7 +1038,7 @@ namespace Edu.WebApi.Controllers.Course
{
OrderId = base.ParmJObj.GetInt("OrderId"),
ClassId = base.ParmJObj.GetInt("ClassId"),
GuestState = base.ParmJObj.GetInt("GuestState"),
GuestState =(GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
GuestName = base.ParmJObj.GetStringValue("GuestName"),
SourceId = base.ParmJObj.GetInt("SourceId"),
};
......@@ -1159,7 +1159,7 @@ namespace Edu.WebApi.Controllers.Course
contractList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(contract);
}
dmodel.ContractUrl = Common.Plugin.JsonHelper.Serialize(contractList);
dmodel.GuestState = 1;
dmodel.GuestState = GuestStateEnum.Normal;
dmodel.Status = 0;
dmodel.Group_Id = userInfo.Group_Id;
dmodel.School_Id = userInfo.School_Id;
......
Edu.WebApi/appsettings.json
View file @ 794e7ead
{
"ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient",
......
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