Skip to content

E
Education
Commit ca88a728 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 123abacc 09628e51
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 95 deletions
Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs
View file @ ca88a728
...@@ -158,7 +158,7 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -158,7 +158,7 @@ namespace Edu.Model.ViewModel.EduTask
/// <summary> /// <summary>
/// 默认选中的日期、周 /// 默认选中的日期、周
/// </summary> /// </summary>
public string DateJson { get; set; } //public string DateJson { get; set; }
/// <summary> /// <summary>
...@@ -170,7 +170,7 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -170,7 +170,7 @@ namespace Edu.Model.ViewModel.EduTask
/// <summary> /// <summary>
/// 默认时间字符串JSON /// 默认时间字符串JSON
/// </summary> /// </summary>
public string DefaultTimeJson { get; set; } // public string DefaultTimeJson { get; set; }
} }
///<summary> ///<summary>
......
Edu.Model/ViewModel/EduTask/RB_Education_Relevance_ViewModel.cs
View file @ ca88a728
...@@ -11,5 +11,9 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -11,5 +11,9 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary> /// </summary>
public class RB_Education_Relevance_ViewModel : RB_Education_Relevance public class RB_Education_Relevance_ViewModel : RB_Education_Relevance
{ {
/// <summary>
/// 多个单据查询【逗号分隔】
/// </summary>
public string QConditionIds { get; set; }
} }
} }
Edu.Module.Course/ClassModule.cs
View file @ ca88a728
...@@ -268,22 +268,25 @@ namespace Edu.Module.Course ...@@ -268,22 +268,25 @@ namespace Edu.Module.Course
var classOrderList = new List<RB_Order_ViewModel>(); var classOrderList = new List<RB_Order_ViewModel>();
var stepPriceList = new List<RB_Class_StepPrice_ViewModel>(); var stepPriceList = new List<RB_Class_StepPrice_ViewModel>();
var otherCourseList = new List<RB_Class_Course_Extend>(); var otherCourseList = new List<RB_Class_Course_Extend>();
var planList = new List<RB_Class_Plan_ViewModel>();
string ids = string.Join(",", list.Select(qitem => qitem.ClassId)); string ids = string.Join(",", list.Select(qitem => qitem.ClassId));
if (!string.IsNullOrEmpty(ids)) if (!string.IsNullOrEmpty(ids))
{ {
classTimeList = class_TimeRepository.GetClassTimeListRepository(ids); classTimeList = class_TimeRepository.GetClassTimeListRepository(ids);
classOrderList = orderRepository.GetClassOrderPeopleNumRepository(ids); classOrderList = orderRepository.GetClassOrderPeopleNumRepository(ids);
otherCourseList = GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids }); otherCourseList = GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids });
planList=class_PlanRepository.GetClassPlanMaxDataRepository(new RB_Class_Plan_ViewModel()
{
QClassIds = ids
});
} }
if (isGetStepPrice) if (isGetStepPrice)
{ {
stepPriceList = class_StepPriceRepository.GetClassStepPriceListRepository(new RB_Class_StepPrice_ViewModel() { QClassIds = ids })?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>(); stepPriceList = class_StepPriceRepository.GetClassStepPriceListRepository(new RB_Class_StepPrice_ViewModel() { QClassIds = ids })?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>();
} }
//课程计划上课日期 //课程计划上课日期
foreach (var item in list) foreach (var item in list)
{ {
item.FinishTimeStr = Common.ConvertHelper.FormatDate(item.EndClassDate);
item.NewPlanDateTime = classTimeList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.NewPlanDateTime; item.NewPlanDateTime = classTimeList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.NewPlanDateTime;
item.OrderStudentCount = classOrderList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.GuestNum ?? 0; item.OrderStudentCount = classOrderList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.GuestNum ?? 0;
if (isGetStepPrice) if (isGetStepPrice)
...@@ -291,6 +294,12 @@ namespace Edu.Module.Course ...@@ -291,6 +294,12 @@ namespace Edu.Module.Course
item.ClassStepPriceList = stepPriceList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>(); item.ClassStepPriceList = stepPriceList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>();
} }
item.OtherCourseList = otherCourseList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_Course_Extend>(); item.OtherCourseList = otherCourseList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_Course_Extend>();
var tempData = planList.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault();
if (tempData != null)
{
item.EndClassDate = tempData.ClassDate;
}
item.FinishTimeStr = Common.ConvertHelper.FormatDate(item.EndClassDate);
} }
} }
return list; return list;
...@@ -1055,20 +1064,31 @@ namespace Edu.Module.Course ...@@ -1055,20 +1064,31 @@ namespace Edu.Module.Course
/// <param name="ClassPlanId"></param> /// <param name="ClassPlanId"></param>
/// <param name="UserInfo">用户信息</param> /// <param name="UserInfo">用户信息</param>
/// <returns></returns> /// <returns></returns>
public bool RemoveClassPlanModule(int ClassPlanId, UserInfo UserInfo) [TransactionCallHandler]
public virtual bool RemoveClassPlanModule(int ClassPlanId, UserInfo UserInfo,out string message)
{ {
bool flag = false;
message = "";
var planModel = class_PlanRepository.GetEntity(ClassPlanId); var planModel = class_PlanRepository.GetEntity(ClassPlanId);
classLogRepository.AddClassLogRepository(new Model.Entity.Log.RB_Class_Log() if (planModel != null)
{ {
LogType = Common.Enum.Course.ClassLogTypeEnum.Class, classLogRepository.AddClassLogRepository(new Model.Entity.Log.RB_Class_Log()
LogContent = "删除【" + Common.ConvertHelper.FormatDate(planModel?.ClassDate) + "】上课计划", {
ClassId = planModel.ClassId, LogType = Common.Enum.Course.ClassLogTypeEnum.Class,
CreateBy = UserInfo.Id, LogContent = "删除【" + Common.ConvertHelper.FormatDate(planModel?.ClassDate) + "】上课计划",
Group_Id = UserInfo.Group_Id, ClassId = planModel.ClassId,
School_Id = UserInfo.School_Id, CreateBy = UserInfo.Id,
}); Group_Id = UserInfo.Group_Id,
UpdateClassEndDateModule(planModel.ClassId); School_Id = UserInfo.School_Id,
return class_PlanRepository.DeleteOne(new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), ClassPlanId)); });
flag = UpdateClassEndDateModule(planModel.ClassId);
flag = class_PlanRepository.DeleteOne(new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), ClassPlanId));
}
else
{
message = "此上课计划不存在,请刷新后再试!";
}
return flag;
} }
/// <summary> /// <summary>
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ ca88a728
...@@ -78,6 +78,11 @@ namespace Edu.Module.EduTask ...@@ -78,6 +78,11 @@ namespace Edu.Module.EduTask
//调课申请 //调课申请
List<RB_Change_ClassPlan_ViewModel> changeClassList = new List<RB_Change_ClassPlan_ViewModel>(); List<RB_Change_ClassPlan_ViewModel> changeClassList = new List<RB_Change_ClassPlan_ViewModel>();
var groupList = list.GroupBy(qitem => new { qitem.ReceiptType }).Select(qitem => new { qitem.Key.ReceiptType }); var groupList = list.GroupBy(qitem => new { qitem.ReceiptType }).Select(qitem => new { qitem.Key.ReceiptType });
string Ids = string.Join(",", list.Select(qitem => qitem.Id));
var relevanceList = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel()
{
QConditionIds = Ids
});
foreach (var subItem in groupList) foreach (var subItem in groupList)
{ {
if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass) if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass)
...@@ -109,7 +114,26 @@ namespace Edu.Module.EduTask ...@@ -109,7 +114,26 @@ namespace Edu.Module.EduTask
//调课 //调课
if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass) if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
{ {
DataObj = changeClassList.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault(); var tempModel = changeClassList.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault();
if (tempModel != null )
{
if (!string.IsNullOrEmpty(tempModel.SourceData))
{
tempModel.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(tempModel.SourceData);
}
if (!string.IsNullOrEmpty(tempModel.TargetData))
{
if (tempModel.MoveType == 1)
{
tempModel.NewChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(tempModel.TargetData);
}
else if (tempModel.MoveType == 2)
{
tempModel.AllChangePlanModel = Common.Plugin.JsonHelper.DeserializeObject<AllChangePlanItem>(tempModel.TargetData);
}
}
}
DataObj = tempModel;
} }
var obj = new var obj = new
{ {
...@@ -147,7 +171,11 @@ namespace Edu.Module.EduTask ...@@ -147,7 +171,11 @@ namespace Edu.Module.EduTask
var backModel = student_BackClassRepository.GetEntity(receipt.RelationId); var backModel = student_BackClassRepository.GetEntity(receipt.RelationId);
ApplyReason = backModel?.ApplyReason ?? ""; ApplyReason = backModel?.ApplyReason ?? "";
} }
else if (receipt.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
{
var changeClassModel = change_ClassPlanRepository.GetEntity<RB_Change_ClassPlan_ViewModel>(receipt.RelationId);
ApplyReason = changeClassModel?.ChangeTypeStr + " " + changeClassModel?.MoveTypeStr;
}
//获取审核记录 //获取审核记录
var aurList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel() var aurList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
{ {
...@@ -651,7 +679,10 @@ namespace Edu.Module.EduTask ...@@ -651,7 +679,10 @@ namespace Edu.Module.EduTask
} }
if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass) if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
{ {
if (auditModel.AuditStatus == 2)
{
flag = change_ClassPlanRepository.UpdateChangeClassPlan(receiptModel.RelationId);
}
} }
return flag; return flag;
} }
......
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @ ca88a728
...@@ -78,7 +78,7 @@ WHERE 1=1 ...@@ -78,7 +78,7 @@ WHERE 1=1
} }
if (!string.IsNullOrEmpty(query.QIds)) if (!string.IsNullOrEmpty(query.QIds))
{ {
builder.AppendFormat(@" AND A.{0}IN({1}) ", nameof(RB_Education_Receipt_ViewModel.Id), query.QIds); builder.AppendFormat(@" AND A.{0} IN ({1}) ", nameof(RB_Education_Receipt_ViewModel.Id), query.QIds);
} }
if (!string.IsNullOrEmpty(query.Title)) if (!string.IsNullOrEmpty(query.Title))
{ {
......
Edu.Repository/EduTask/RB_Education_RelevanceRepository.cs
View file @ ca88a728
...@@ -33,6 +33,10 @@ WHERE 1=1 ...@@ -33,6 +33,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Relevance_ViewModel.ConditionId), query.ConditionId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Relevance_ViewModel.ConditionId), query.ConditionId);
} }
if (!string.IsNullOrEmpty(query.QConditionIds))
{
builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Education_Relevance_ViewModel.ConditionId), query.QConditionIds);
}
} }
builder.AppendFormat(" ORDER BY Sort ASC "); builder.AppendFormat(" ORDER BY Sort ASC ");
return Get<RB_Education_Relevance_ViewModel>(builder.ToString()).ToList(); return Get<RB_Education_Relevance_ViewModel>(builder.ToString()).ToList();
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ ca88a728
...@@ -637,9 +637,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -637,9 +637,8 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult RemoveClassPlan() public ApiResult RemoveClassPlan()
{ {
var ClassPlanId = base.ParmJObj.GetInt("ClassPlanId"); var ClassPlanId = base.ParmJObj.GetInt("ClassPlanId");
var flag = classModule.RemoveClassPlanModule(ClassPlanId, base.UserInfo); var flag = classModule.RemoveClassPlanModule(ClassPlanId, base.UserInfo,out string message);
return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
return flag ? ApiResult.Success() : ApiResult.Failed();
} }
/// <summary> /// <summary>
...@@ -1677,7 +1676,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1677,7 +1676,6 @@ namespace Edu.WebApi.Controllers.Course
/// <returns></returns> /// <returns></returns>
public ApiResult GetNewTeacherPlan() public ApiResult GetNewTeacherPlan()
{ {
var query = new RB_Class_ViewModel() var query = new RB_Class_ViewModel()
{ {
Group_Id = base.UserInfo.Group_Id, Group_Id = base.UserInfo.Group_Id,
......
Edu.WebApi/Controllers/EduTask/ChangePlanController.cs
View file @ ca88a728
...@@ -101,74 +101,6 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -101,74 +101,6 @@ namespace Edu.WebApi.Controllers.EduTask
{ {
if (model.ChangeType == 1) if (model.ChangeType == 1)
{ {
//排课方式
try
{
// string WeekDayListStr = model.AllChangePlanModel.WeekDayList; // base.ParmJObj.GetStringValue("WeekDayList");
switch (model.AllChangePlanModel.ClassStyle)
{
//按周排课
case ClassStyleEnum.Week:
if (model.AllChangePlanModel.WeekDayList != null && model.AllChangePlanModel.WeekDayList.Any())
{
// model.AllChangePlanModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
model.AllChangePlanModel.DateJson = Common.Plugin.JsonHelper.Serialize(model.AllChangePlanModel.WeekDayList);
}
else
{
model.AllChangePlanModel.DateJson = "";
}
break;
//固定日期排课
case ClassStyleEnum.FixedDate:
if (model.AllChangePlanModel.WeekDayList != null && model.AllChangePlanModel.WeekDayList.Any())
{
// model.AllChangePlanModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
model.AllChangePlanModel.DateJson = Common.Plugin.JsonHelper.Serialize(model.AllChangePlanModel.WeekDayList);
}
else
{
model.AllChangePlanModel.DateJson = "";
}
break;
//按月排课
case ClassStyleEnum.Month:
if (model.AllChangePlanModel.WeekDayList != null && model.AllChangePlanModel.WeekDayList.Any())
{
// model.AllChangePlanModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
model.AllChangePlanModel.DateJson = Common.Plugin.JsonHelper.Serialize(model.AllChangePlanModel.WeekDayList);
}
else
{
model.AllChangePlanModel.DateJson = "";
}
break;
//网约课
case ClassStyleEnum.OnLine:
model.AllChangePlanModel.DateJson = "";
break;
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SetChangeClassPlan");
}
//try
//{
// string DefaultPlanTimeListStr = base.ParmJObj.GetStringValue("DefaultPlanTimeList");
// if (!string.IsNullOrEmpty(DefaultPlanTimeListStr))
// {
// model.AllChangePlanModel.DefaultTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<Edu.Model.ViewModel.EduTask.ClassTimeItem>>(DefaultPlanTimeListStr);
// }
// else
// {
// return ApiResult.Failed("请输入上课时间");
// }
//}
//catch (Exception ex)
//{
// Common.Plugin.LogHelper.Write(ex, "SetClass_DefaultPlanTimeList");
//}
List<string> dayList = new List<string>(); List<string> dayList = new List<string>();
if (model.AllChangePlanModel.DefaultTimeList != null && model.AllChangePlanModel.DefaultTimeList.Count > 0) if (model.AllChangePlanModel.DefaultTimeList != null && model.AllChangePlanModel.DefaultTimeList.Count > 0)
{ {
...@@ -233,7 +165,6 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -233,7 +165,6 @@ namespace Edu.WebApi.Controllers.EduTask
} }
return ApiResult.ParamIsNull(message: "学习时间段" + (tempStr) + message2.TrimStart(',') + "重复!"); return ApiResult.ParamIsNull(message: "学习时间段" + (tempStr) + message2.TrimStart(',') + "重复!");
} }
model.AllChangePlanModel.DefaultTimeJson = Common.Plugin.JsonHelper.Serialize(model.AllChangePlanModel.DefaultTimeList);
} }
else else
{ {
...@@ -250,10 +181,8 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -250,10 +181,8 @@ namespace Edu.WebApi.Controllers.EduTask
} }
else else
{ {
return ApiResult.Failed("班级信息不存在"); return ApiResult.Failed("班级信息不存在");
} }
} }
else if (model.ChangeType == 2) else if (model.ChangeType == 2)
{ {
......
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