Skip to content

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

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

parents da24a2f3 b0c0fe81
Hide whitespace changes
Inline Side-by-side
Showing with 409 additions and 64 deletions
Edu.Common/Plugin/ConvertHelper.cs
View file @ ad79536a
......@@ -188,6 +188,24 @@ namespace Edu.Common
return list;
}
/// <summary>
/// 时间集合转字符串用户SQL查询使用
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static string DateTimeListToString(List<DateTime> list)
{
string str = "";
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
str += ",'" + FormatDate(item) + "'";
}
}
return str.TrimStart(',').TrimEnd(',');
}
/// <summary>
/// 根据日期获取星期几
/// </summary>
......@@ -230,7 +248,7 @@ namespace Edu.Common
public static int CalcMinutes(DateTime start, DateTime end)
{
int minutes=Convert.ToInt32((end - start).TotalSeconds);
minutes = minutes / 60;
minutes /= 60;
return minutes;
}
......
Edu.Model/Entity/Course/RB_Class_Plan.cs
View file @ ad79536a
......@@ -66,5 +66,10 @@ namespace Edu.Model.Entity.Course
/// 0-未反馈，1-已反馈
/// </summary>
public int ParentFanKuiStatus { get; set; }
/// <summary>
/// 上课计划重复的计划编号
/// </summary>
public string RepeatPlanIds { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs
View file @ ad79536a
......@@ -103,6 +103,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary>
public string QClassDateStr { get; set; }
/// <summary>
/// 是否查询上课计划有重复的数据【1-是】
/// </summary>
public int IsQRepeat { get; set; }
/// <summary>
/// 老师备课次数>0已备课
/// </summary>
......
Edu.Module.Course/ClassModule.cs
View file @ ad79536a
......@@ -156,7 +156,7 @@ namespace Edu.Module.Course
private readonly RB_User_ChangeLogRepository user_ChangeLogRepository = new RB_User_ChangeLogRepository();
/// <summary>
/// 获取班级列表
/// </summary>
......@@ -545,12 +545,11 @@ namespace Edu.Module.Course
}
}
#endregion
//班级上课计划列表
List<RB_Class_Plan_ViewModel> classPlanList = CreateClassPlanList(model, defaultPlanTimeList, BasicMinutes);
model.ClassPlanList = classPlanList;
AddClassPlanModule(model);
#endregion
model.ClassPlanList = classPlanList;
return flag;
}
......@@ -559,36 +558,208 @@ namespace Edu.Module.Course
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public void AddClassPlanModule(RB_Class_ViewModel model)
public bool AddClassPlanModule(int ClassId, List<RB_Class_Plan_ViewModel> planList,out bool result)
{
Task.Run(() =>
bool flag = true;
result = false;
RB_Class_ViewModel model = GetClassModule(ClassId);
model.ClassPlanList = planList;
List<TimeItem> timeItemList = new List<TimeItem>();
if (model.ClassPlanList != null && model.ClassPlanList.Count > 0)
{
var datetimeList = model.ClassPlanList.Select(qitem => qitem.ClassDate).ToList();
var dateStr = Common.ConvertHelper.DateTimeListToString(datetimeList);
//添加班级上课计划
var tempPlanList = class_PlanRepository.BatchInsertClassPlanRepository(model.ClassPlanList);
List<RB_Class_Time> timeList = new List<RB_Class_Time>();
foreach (var item in model.ClassPlanList)
{
var newClassPlanId = tempPlanList?.Where(qitem => qitem.ClassId == item.ClassId && Common.ConvertHelper.FormatDate(qitem.ClassDate) == Common.ConvertHelper.FormatDate(item.ClassDate))?.FirstOrDefault()?.ClassPlanId ?? 0;
if (newClassPlanId > 0 && item.PlanTimeList != null && item.PlanTimeList.Count > 0)
{
foreach (var subItem in item.PlanTimeList)
{
var classTime = new RB_Class_Time()
{
ClassTimeId = 0,
ClassId = model.ClassId,
ClassPlanId = newClassPlanId,
StartTime = subItem.StartTime,
EndTime = subItem.EndTime,
Group_Id = model.Group_Id,
School_Id = model.School_Id,
ClassStatus = 0,
TimeHour = subItem.TimeHour
};
timeList.Add(classTime);
}
}
}
if (timeList != null && timeList.Count > 0)
{
flag = class_TimeRepository.BatchInsertClassTimeRepository(timeList);
}
}
var newPlanList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel()
{
if (model.ClassPlanList != null && model.ClassPlanList.Count > 0)
ClassId = ClassId,
StartTime = Common.ConvertHelper.FormatDate(DateTime.Now)
});
foreach (var item in newPlanList)
{
timeItemList.Add(new TimeItem()
{
foreach (var item in model.ClassPlanList)
StartTime = Common.ConvertHelper.FormatDate(item.ClassDate) + " " + item.StartTime + ":00",
EndTime = Common.ConvertHelper.FormatDate(item.ClassDate) + " " + item.EndTime + ":00",
});
}
var repeatList = class_PlanRepository.CheckClassPlanRepository(model.ClassId, timeItemList);
var updatePlanList = new List<RB_Class_Plan_ViewModel>();
foreach (var item in newPlanList)
{
var tempRepeatList = repeatList?.Where(qitem => qitem.ClassDate == item.ClassDate)?.ToList();
List<int> ids = new List<int>();
if (tempRepeatList != null && tempRepeatList.Count > 0)
{
if (item.TeacherId > 0)
{
item.ClassPlanId = 0;
if (!class_PlanRepository.CheckExistsRepository(item))
var teacherList = tempRepeatList?.Where(qitem => qitem.TeacherId == item.TeacherId)?.ToList();
if (teacherList != null && teacherList.Count > 0)
{
//添加班级上课计划
var newClassPlanId = class_PlanRepository.Insert(item);
if (item.PlanTimeList != null && item.PlanTimeList.Count > 0)
var tempIds = Common.ConvertHelper.StringToList(string.Join(",", teacherList.GroupBy(qitem => qitem.ClassPlanId).Select(qitem => qitem.Key)));
if (tempIds != null && tempIds.Count > 0)
{
foreach (var subItem in item.PlanTimeList)
{
subItem.ClassTimeId = 0;
subItem.ClassPlanId = newClassPlanId;
subItem.ClassId = model.ClassId;
subItem.Group_Id = model.Group_Id;
subItem.School_Id = model.School_Id;
//添加班级上课计划的上课时间
class_TimeRepository.Insert(subItem);
}
ids.AddRange(tempIds);
}
}
}
if (item.ClassRoomId > 0)
{
var classroomList = tempRepeatList?.Where(qitem => qitem.ClassRoomId == item.ClassRoomId)?.ToList();
if (classroomList != null && classroomList.Count > 0)
{
var tempIds = Common.ConvertHelper.StringToList(string.Join(",", classroomList.GroupBy(qitem => qitem.ClassPlanId).Select(qitem => qitem.Key)));
if (tempIds != null && tempIds.Count > 0)
{
ids.AddRange(tempIds);
}
}
}
}
string RepeatPlanIds = "";
if (ids != null && ids.Count > 0)
{
RepeatPlanIds = string.Join(",", ids);
if (!result)
{
result = true;
}
}
updatePlanList.Add(new RB_Class_Plan_ViewModel()
{
ClassPlanId=item.ClassPlanId,
RepeatPlanIds= RepeatPlanIds,
});
}
if (updatePlanList != null && updatePlanList.Count > 0)
{
flag = class_PlanRepository.BatchUpdateClassPlanRepository(updatePlanList);
}
return flag;
}
/// <summary>
/// 获取有冲突的上课计划
/// </summary>
/// <param name="classId"></param>
public object GetRepeatClassPlanModule(int ClassId)
{
List<object> result = new List<object>();
var list = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel()
{
ClassId = ClassId,
IsQRepeat = 1
});
if (list != null && list.Count > 0)
{
string repeatIds = string.Join(",", list.Select(qitem => qitem.RepeatPlanIds));
var repeatList = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel()
{
QClassPlanIds = repeatIds
});
List<int> ids = new List<int>();
var planIds = Common.ConvertHelper.StringToList(string.Join(",", list.Select(qitem => qitem.ClassPlanId)));
if (planIds != null && planIds.Count > 0)
{
ids.AddRange(planIds);
}
var repeatPlanIds = Common.ConvertHelper.StringToList(string.Join(",", repeatList.Select(qitem => qitem.ClassPlanId)));
if (repeatPlanIds != null && repeatPlanIds.Count > 0)
{
ids.AddRange(repeatPlanIds);
}
List<RB_Class_Time_ViewModel> timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel()
{
QClassPlanIds = string.Join(",", ids)
});
foreach (var item in list)
{
List<object> PlanRepeatList = new List<object>();
var tempRepeatList = repeatList?.Where(qitem => qitem.ClassDate == item.ClassDate)?.ToList();
if (tempRepeatList != null && tempRepeatList.Count > 0)
{
if (tempRepeatList.Count > 1)
{
}
foreach (var subItem in tempRepeatList)
{
var tempObj = new
{
subItem.ClassPlanId,
subItem.ClassId,
ClassDate = Common.ConvertHelper.FormatDate(subItem.ClassDate),
subItem.TeacherId,
subItem.TeacherName,
subItem.ClassRoomId,
subItem.RoomName,
PlanTimeList = timeList.Where(qitem => qitem.ClassPlanId == subItem.ClassPlanId).Select(qitem => new
{
qitem.ClassTimeId,
qitem.ClassId,
qitem.ClassPlanId,
qitem.StartTime,
qitem.EndTime,
qitem.TimeHour
}),
};
PlanRepeatList.Add(tempObj);
}
}
var obj = new
{
item.ClassPlanId,
item.ClassId,
ClassDate=Common.ConvertHelper.FormatDate(item.ClassDate),
item.TeacherId,
item.TeacherName,
item.ClassRoomId,
item.RoomName,
PlanTimeList= timeList.Where(qitem => qitem.ClassPlanId == item.ClassPlanId).Select(qitem => new {
qitem.ClassTimeId,
qitem.ClassId,
qitem.ClassPlanId,
qitem.StartTime,
qitem.EndTime,
qitem.TimeHour
}),
PlanRepeatList
};
result.Add(obj);
}
}
return result;
}
/// <summary>
......@@ -597,7 +768,7 @@ namespace Edu.Module.Course
/// <param name="model"></param>
/// <param name="message"></param>
/// <returns></returns>
public virtual bool SetClassStatusModule(RB_Class_ViewModel model,out string message)
public virtual bool SetClassStatusModule(RB_Class_ViewModel model, out string message)
{
message = "";
Dictionary<string, object> fileds = new Dictionary<string, object>()
......@@ -699,7 +870,7 @@ namespace Edu.Module.Course
/// <returns></returns>
private List<RB_Class_Plan_ViewModel> CreateClassPlanList(RB_Class_ViewModel model, List<ClassTimeItem> defaultPlanTimeList, int BasicMinutes)
{
var planList = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel() { ClassId = model.ClassId, StartTime = DateTime.Now.ToString("yyyy-MM-dd") });
var planList = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel() { ClassId = model.ClassId, StartTime = Common.ConvertHelper.FormatDate(DateTime.Now) });
if (planList != null && planList.Count > 0)
{
string ids = string.Join(",", planList.Select(qitem => qitem.ClassPlanId));
......@@ -709,15 +880,26 @@ namespace Edu.Module.Course
var flag2 = class_PlanRepository.DeleteClassPlanRepository(ids);
}
}
var oldPlanList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel()
{
ClassId = model.ClassId,
EndTime = Common.ConvertHelper.FormatDate(DateTime.Now.AddDays(-1))
});
//已经完成的上课计划
var finishClassHours = oldPlanList?.Sum(qitem => qitem.TimeHour) ?? 0;
List<RB_Class_Plan_ViewModel> classPlanList = new List<RB_Class_Plan_ViewModel>();
if (model.ClassHours > 0&& defaultPlanTimeList!=null && defaultPlanTimeList.Count>0)
if (model.ClassHours > 0 && defaultPlanTimeList != null && defaultPlanTimeList.Count > 0)
{
var srartDate = model.OpenTime;
if (model.OpenTime < DateTime.Now)
{
srartDate = DateTime.Now;
}
//按周排课和按月排课
if (model.ClassStyle == ClassStyleEnum.Week || model.ClassStyle == ClassStyleEnum.Month)
{
int i = 0;
double totalHours = 0;
double totalHours = Convert.ToDouble(finishClassHours);
while (model.ClassHours > totalHours)
{
var newDate = srartDate.AddDays(i);
......@@ -894,7 +1076,6 @@ namespace Edu.Module.Course
TimeHour = sItem.TimeHour,
};
classTimeList.Add(timeModel);
var startDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + sItem.StartTime + ":00");
var endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + sItem.EndTime + ":00");
TimeSpan span = endDate.Subtract(startDate);
......@@ -903,7 +1084,6 @@ namespace Edu.Module.Course
dayMinutes += span.TotalMinutes;
}
}
if (model.ClassHourMinute > 0)
{
dayClassHours = dayMinutes / model.ClassHourMinute;
......@@ -1280,7 +1460,7 @@ namespace Edu.Module.Course
/// </summary>
/// <param name="classId">班级编号</param>
/// <returns></returns>
public object GetClassStudentListModule(int classId, int school_Id, int group_Id, int ClassTimeId, int QEffectStatus = 0,int QNoFinish=0)
public object GetClassStudentListModule(int classId, int school_Id, int group_Id, int ClassTimeId, int QEffectStatus = 0, int QNoFinish = 0)
{
List<object> list = new List<object>();
var orderStudentList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel()
......@@ -1305,7 +1485,7 @@ namespace Edu.Module.Course
}
if (QNoFinish == 1)
{
orderStudentList = orderStudentList.Where(qitem => qitem.GuestState == 1&&(qitem.TotalHours-qitem.CompleteHours)>0).ToList();
orderStudentList = orderStudentList.Where(qitem => qitem.GuestState == 1 && (qitem.TotalHours - qitem.CompleteHours) > 0).ToList();
}
if (orderStudentList != null && orderStudentList.Count > 0)
{
......@@ -1326,12 +1506,12 @@ namespace Edu.Module.Course
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
item.Mobile,
item.OrderId,
EnterName= UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName??"",
EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "",
item.ContractTotalHours,
item.TotalHours,
item.CompleteHours,
item.ValidClassHours,
SurplusHours=item.TotalHours-item.CompleteHours,
SurplusHours = item.TotalHours - item.CompleteHours,
item.MakeUpHours,
ClassHours = item.CompleteHours + "-" + (classModel?.ClassHours ?? 0),
IsRenew = item.IsRenewOrder,
......@@ -1564,7 +1744,8 @@ namespace Edu.Module.Course
{
guestName = "";
var mmodel = student_MakeupRepository.GetStudentMakeupListRepository(new RB_Student_Makeup_ViewModel() { ClassCheckId = classCheckId }).FirstOrDefault();
if (mmodel != null && mmodel.MakeUpStatus != 1) {
if (mmodel != null && mmodel.MakeUpStatus != 1)
{
guestName = order_GuestRepository.GetEntity(mmodel.OrderGuestId)?.GuestName ?? "";
return true;
}
......@@ -3307,11 +3488,9 @@ namespace Edu.Module.Course
StartTime = item?.StartTime ?? "",
EndTime = item?.EndTime ?? "",
GuestList = item.ClassType == 1 ? tempTimeGuestList?.Select(qitem => new { qitem.GuestName }) : visitorList?.Where(qitem => qitem.ReserveClassId == item.ClassTimeId)?.Select(qitem => new { GuestName = qitem.VisitorName }),
});
}
}
return result;
}
......@@ -3463,7 +3642,7 @@ namespace Edu.Module.Course
#endregion
......@@ -3504,5 +3683,5 @@ namespace Edu.Module.Course
#endregion
}
}
}
Edu.Module.Course/StudentBillModule.cs
View file @ ad79536a
......@@ -149,7 +149,7 @@ namespace Edu.Module.Course
}
};
var classModel = classRepository.GetEntity(backModel.ClassId);
string Remark = "【" + (classModel?.ClassName ?? "") + "】下,订单" + backModel.OrderId + " 客人退课";
string Remark = backModel.ApplyReason+ "【" + (classModel?.ClassName ?? "") + "】下,订单" + backModel.OrderId + " 客人退课";
var financeObj = new
{
IsPublic,
......
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ ad79536a
......@@ -68,6 +68,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
}
if (query.IsQRepeat == 1)
{
builder.AppendFormat(" AND IFNULL(A.{0},'')<>'' ", nameof(RB_Class_Plan_ViewModel.RepeatPlanIds));
}
}
return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
}
......@@ -257,6 +261,23 @@ WHERE a.`Status`=0 ");
return base.Exists(list);
}
/// <summary>
/// 批量验证同一班级的上课计划
/// </summary>
/// <param name="classId"></param>
/// <param name="qClassDate"></param>
/// <returns></returns>
public List<RB_Class_Plan_ViewModel> BatchCheckExistsRepository(int classId, string qClassDate)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM rb_class_plan AS A
WHERE A.`Status`=0 AND A.ClassId={0} AND A.ClassDate IN({1})
", classId, qClassDate);
return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
}
/// <summary>
/// 老师改变则修改后面的代课老师为新的教师编号
/// </summary>
......@@ -696,9 +717,10 @@ GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassR
/// <summary>
/// 检查上课计划是否存在时间上的交集【HK2021-07-28新增】
/// </summary>
/// <param name="query"></param>
/// <param name="classId"></param>
/// <param name="timeList"></param>
/// <returns></returns>
public List<RB_Class_Plan_ViewModel> CheckClassPlanRepository(RB_Class_Plan_ViewModel query)
public List<RB_Class_Plan_ViewModel> CheckClassPlanRepository(int classId,List<TimeItem> timeList)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
......@@ -710,18 +732,89 @@ SELECT A.* FROM
WHERE A.`Status`=0 AND A.ClassDate>='{0}' AND C.ClassStatus IN(1,2)
) AS A
WHERE 1=1
",Common.ConvertHelper.FormatDate(DateTime.Now));
if (query.ClassId > 0)
", Common.ConvertHelper.FormatDate(DateTime.Now));
if (classId > 0)
{
builder.AppendFormat(" AND A.{0}<>{1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
builder.AppendFormat(" AND A.{0}<>{1} ", nameof(RB_Class_Plan_ViewModel.ClassId), classId);
}
if (!string.IsNullOrEmpty(query.StartTime) && !string.IsNullOrEmpty(query.EndTime))
if (timeList != null && timeList.Count > 0)
{
builder.AppendFormat("AND (NOT (A.StartTime > '{0}' OR A.EndTime < '{1}') ) ",query.EndTime,query.StartTime);
string tempStr = "";
int index = 0;
foreach (var item in timeList)
{
if (index == 0)
{
tempStr += string.Format(" (NOT (A.StartTime > '{0}' OR A.EndTime < '{1}')) ", item.EndTime, item.StartTime);
}
else
{
tempStr += string.Format(" OR (NOT (A.StartTime > '{0}' OR A.EndTime < '{1}')) ", item.EndTime, item.StartTime);
}
index++;
}
if (!string.IsNullOrEmpty(tempStr))
{
builder.AppendFormat(" AND ({0}) ", tempStr);
}
}
return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
}
/// <summary>
/// 批量添加上课计划
/// </summary>
/// <param name="planList"></param>
/// <returns></returns>
public List<RB_Class_Plan_ViewModel> BatchInsertClassPlanRepository(List<RB_Class_Plan_ViewModel> planList)
{
List<RB_Class_Plan_ViewModel> newPlanList = new List<RB_Class_Plan_ViewModel>();
bool flag = true;
if (planList != null && planList.Count > 0)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(" INSERT INTO RB_Class_Plan(ClassId,ClassDate,Status,ClassRoomId,Group_Id,School_Id,TeacherId,BeiKeStatus,FanKuiStatus,ParentFanKuiStatus) ");
builder.AppendFormat(" VALUES ");
string tempStr = "";
foreach (var item in planList)
{
tempStr += $",({item.ClassId},'{Common.ConvertHelper.FormatDate(item.ClassDate)}',0,{item.ClassRoomId},{item.Group_Id},{item.School_Id},{item.TeacherId},0,0,0) ";
}
builder.Append(tempStr.TrimStart(','));
flag = base.Execute(builder.ToString()) > 0;
if (flag)
{
newPlanList = GetClassPlanListRepository(new RB_Class_Plan_ViewModel() { ClassId = planList[0].ClassId, StartTime = Common.ConvertHelper.FormatDate(DateTime.Now) });
}
}
return newPlanList;
}
/// <summary>
/// 批量更新上课计划冲突的计划编号
/// </summary>
/// <param name="planList"></param>
/// <returns></returns>
public bool BatchUpdateClassPlanRepository(List<RB_Class_Plan_ViewModel> planList)
{
bool flag = true;
if (planList != null && planList.Count > 0)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(" INSERT INTO RB_Class_Plan(ClassPlanId,RepeatPlanIds) ");
builder.AppendFormat(" VALUES ");
string tempStr = "";
foreach (var item in planList)
{
tempStr += $",({item.ClassPlanId},'{item.RepeatPlanIds}') ";
}
builder.Append(tempStr.TrimStart(','));
builder.Append(" ON DUPLICATE KEY UPDATE RepeatPlanIds =VALUES(RepeatPlanIds) ");
flag = base.Execute(builder.ToString()) > 0;
}
return flag;
}
#endregion
}
}
\ No newline at end of file
}
Edu.Repository/Course/RB_Class_TimeRepository.cs
View file @ ad79536a
......@@ -203,7 +203,6 @@ where b.`Status`=0 and DATE_FORMAT(b.ClassDate,'%y/%m/%d')=DATE_FORMAT(NOW(),'%y
return Get<RB_Class_Time_ViewModel>(builder.ToString()).ToList();
}
#region 教师上课挂件查询
/// <summary>
......@@ -267,7 +266,28 @@ where a.`Status`=0 and c.ClassStatus in(1,2) and a.TeacherId={TId} and c.`Sta
#endregion
/// <summary>
/// 批量添加上课计划时间
/// </summary>
/// <param name="timeList"></param>
/// <returns></returns>
public bool BatchInsertClassTimeRepository(List<RB_Class_Time> timeList)
{
bool flag = true;
if (timeList != null && timeList.Count > 0)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(" INSERT INTO RB_Class_Time(ClassId,ClassPlanId,StartTime,EndTime,Group_Id,School_Id,ClassStatus,TimeHour) ");
builder.AppendFormat(" VALUES ");
string tempStr = "";
foreach (var item in timeList)
{
tempStr += $",({item.ClassId},{item.ClassPlanId},'{item.StartTime}','{item.EndTime}',{item.Group_Id},{item.School_Id},0,{item.TimeHour} ) ";
}
builder.Append(tempStr.TrimStart(','));
flag = base.Execute(builder.ToString()) > 0;
}
return flag;
}
}
}
Edu.Repository/Course/RB_Order_GuestRepository.cs
View file @ ad79536a
......@@ -700,11 +700,11 @@ WHERE 1=1 and A.Status=0 and class.Status=0 and class.ClassStatus <>4 and b.Or
if (demodel.OrderTime.HasValue)
{
builder.AppendFormat($@" AND DATE_FORMAT(B.CreateTime,'%y-%m-%d')>=DATE_FORMAT('{demodel.OrderTime.Value.ToString("yyyy-MM-dd")}','%y-%m-%d')");
builder.AppendFormat($@" AND DATE_FORMAT(B.CreateTime,'%y-%m-%d')>=DATE_FORMAT('{Common.ConvertHelper.FormatDate(demodel.OrderTime)}','%y-%m-%d')");
}
if (demodel.EndOrderTime.HasValue)
{
builder.AppendFormat($@" AND DATE_FORMAT(B.CreateTime,'%y-%m-%d')<=DATE_FORMAT('{demodel.EndOrderTime.Value.ToString("yyyy-MM-dd")}','%y-%m-%d')");
builder.AppendFormat($@" AND DATE_FORMAT(B.CreateTime,'%y-%m-%d')<=DATE_FORMAT('{Common.ConvertHelper.FormatDate(demodel.EndOrderTime)}','%y-%m-%d')");
}
if (demodel.EffectStatus.HasValue)
{
......
Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs
View file @ ad79536a
......@@ -219,7 +219,8 @@ WHERE 1=1
}
}
else
{//全局修改
{
//全局修改
AllChangePlanItem allChangePlanModel = new AllChangePlanItem();
//目标数据
if (!string.IsNullOrWhiteSpace(model.TargetData))
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ ad79536a
......@@ -368,11 +368,39 @@ namespace Edu.WebApi.Controllers.Course
extModel.DefaultTimeJson = "";
}
bool flag = classModule.SetClassModule(extModel);
if (flag)
{
classModule.UpdateClassEndDateModule(extModel.ClassId);
}
return flag ? ApiResult.Success() : ApiResult.Failed();
//if (flag)
//{
// classModule.UpdateClassEndDateModule(extModel.ClassId);
//}
return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed();
}
/// <summary>
/// 批量添加上课计划
/// </summary>
/// <returns></returns>
public ApiResult BatchSetClassPlan()
{
var ClassId = base.ParmJObj.GetInt("ClassId");
var planList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Class_Plan_ViewModel>>(base.ParmJObj.GetStringValue("PlanList"));
List<RB_Class_Plan_ViewModel> result = new List<RB_Class_Plan_ViewModel>();
bool flag = false;
bool IsRepeat = false;
var t1 = new Task(() => { flag = classModule.AddClassPlanModule(ClassId, planList,out IsRepeat); });
t1.Start();
Task.WaitAll(t1);
return flag ? ApiResult.Success(data: IsRepeat) : ApiResult.Failed();
}
/// <summary>
/// 获取有冲突的上课计划
/// </summary>
/// <returns></returns>
public ApiResult GetRepeatClassPlan()
{
var ClassId = base.ParmJObj.GetInt("ClassId");
var obj = classModule.GetRepeatClassPlanModule(ClassId);
return ApiResult.Success(data: obj);
}
/// <summary>
......@@ -919,8 +947,6 @@ namespace Edu.WebApi.Controllers.Course
return result ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 邀请学生
/// </summary>
......@@ -942,6 +968,7 @@ namespace Edu.WebApi.Controllers.Course
bool result = classModule.AddClassStudentDropOutModule(model, base.UserInfo.AccountName);
return result ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取教室页列表
/// </summary>
......@@ -958,13 +985,11 @@ namespace Edu.WebApi.Controllers.Course
TeacherId = base.ParmJObj.GetInt("TeacherId")
};
var list = classModule.GetClassPlanLogPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
pageModel.Count = rowsCount;
pageModel.PageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 多人签到【后台】
/// </summary>
......@@ -1153,7 +1178,6 @@ namespace Edu.WebApi.Controllers.Course
}
/// <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