Skip to content

E
Education
Commit a08a7b87 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 7f40a18b
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 18 deletions
Edu.Model/Entity/User/RB_Student.cs
View file @ a08a7b87
......@@ -102,5 +102,6 @@ namespace Edu.Model.Entity.User
/// 学生状态，1-未学习，2-已退课，3-学习中
/// </summary>
public int StuStatus { get; set; }
}
}
Edu.Model/Entity/User/RB_Teacher.cs
View file @ a08a7b87
......@@ -161,5 +161,11 @@ namespace Edu.Model.Entity.User
/// 离职时间
/// </summary>
public DateTime? LeaveTime { get; set; }
/// <summary>
/// 带班基础人数 2020-12-10 Add by:w
/// </summary>
public int BaseStuNum { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs
View file @ a08a7b87
......@@ -18,5 +18,11 @@ namespace Edu.Model.ViewModel.Course
/// rb_student表的id
/// </summary>
public int StudentId { get; set; }
/// <summary>
/// 生日
/// </summary>
public string BirthDay { get; set; }
}
}
\ No newline at end of file
Edu.Module.Course/ClassModule.cs
View file @ a08a7b87
......@@ -73,6 +73,19 @@ namespace Edu.Module.Course
return classRepository.GetClassListRepository(query);
}
/// <summary>
/// 获取班级上课时间列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Class_Time_ViewModel> GetClassTimeListRepository(RB_Class_Time_ViewModel query)
{
return class_TimeRepository.GetClassTimeListRepository(query);
}
/// <summary>
/// 获取班级分页列表
/// </summary>
......@@ -482,7 +495,7 @@ namespace Edu.Module.Course
}
if (!string.IsNullOrEmpty(extModel.DateJson))
{
extModel.WeekDayList= Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
extModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
}
}
return extModel;
......@@ -596,7 +609,7 @@ namespace Edu.Module.Course
extModel.ClassPlanId = newId;
flag = newId > 0;
}
var oldPlanList= class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel()
var oldPlanList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel()
{
ClassId = extModel.ClassId,
ClassPlanId = extModel.ClassPlanId,
......
Edu.Module.User/AssistModule.cs
View file @ a08a7b87
......@@ -124,19 +124,19 @@ namespace Edu.Module.User
string logContent = "";
if (model.AssistName != oldModel.AssistName)
{
logContent += string.Format(",将姓名由【{0}】修改为【{1}】。", oldModel.AssistName, oldModel.AssistName);
logContent += string.Format(",将姓名由【{0}】修改为【{1}】。", oldModel.AssistName, model.AssistName);
}
if (model.AssistTel != oldModel.AssistTel)
{
logContent += string.Format(",将电话由【{0}】修改为【{1}】。", oldModel.AssistTel, oldModel.AssistTel);
logContent += string.Format(",将电话由【{0}】修改为【{1}】。", oldModel.AssistTel, model.AssistTel);
}
if (model.AssistIntro != oldModel.AssistIntro)
{
logContent += string.Format(",将简介由【{0}】修改为【{1}】。", oldModel.AssistIntro, oldModel.AssistIntro);
logContent += string.Format(",将简介由【{0}】修改为【{1}】。", oldModel.AssistIntro, model.AssistIntro);
}
if (model.AssistIcon != oldModel.AssistIcon)
{
logContent += string.Format(",将头像由【{0}】修改为【{1}】。", oldModel.AssistIcon, oldModel.AssistIcon);
logContent += string.Format(",将头像由【{0}】修改为【{1}】。", oldModel.AssistIcon, model.AssistIcon);
}
if (model.IDCard != oldModel.IDCard)
{
......
Edu.Module.User/TeacherModule.cs
View file @ a08a7b87
......@@ -121,6 +121,7 @@ namespace Edu.Module.User
fileds.Add(nameof(RB_Teacher_ViewModel.IsShow), model.IsShow);
fileds.Add(nameof(RB_Teacher_ViewModel.TeacherIntro), model.TeacherIntro);
fileds.Add(nameof(RB_Teacher_ViewModel.TeacherSay), model.TeacherSay);
fileds.Add(nameof(RB_Teacher_ViewModel.BaseStuNum), model.BaseStuNum);
}
else
{
......@@ -136,13 +137,16 @@ namespace Edu.Module.User
string logContent = "";
if (model.TeacherName != oldModel.TeacherName)
{
logContent += string.Format(",将姓名由【{0}】修改为【{1}】。", oldModel.TeacherName, oldModel.TeacherName);
logContent += string.Format(",将姓名由【{0}】修改为【{1}】。", oldModel.TeacherName, model.TeacherName);
}
if (model.TeacherTel != oldModel.TeacherTel)
{
logContent += string.Format(",将电话由【{0}】修改为【{1}】。", oldModel.TeacherTel, oldModel.TeacherTel);
logContent += string.Format(",将电话由【{0}】修改为【{1}】。", oldModel.TeacherTel, model.TeacherTel);
}
if (model.BaseStuNum != oldModel.BaseStuNum)
{
logContent += string.Format(",将带班基础人数由【{0}】修改为【{1}】。", oldModel.BaseStuNum, model.BaseStuNum);
}
if (model.IDCard != oldModel.IDCard)
{
logContent += string.Format(",将身份证由【{0}】修改为【{1}】。", oldModel.IDCard, model.IDCard);
......
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ a08a7b87
......@@ -136,6 +136,10 @@ LEFT JOIN rb_teacher as c on c.TId=a.TeacherId
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
}
if (query.TeacherId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.TeacherId), query.TeacherId);
}
if (query.Status >= 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)query.Status);
......
Edu.Repository/Course/RB_Class_TimeRepository.cs
View file @ a08a7b87
......@@ -43,6 +43,14 @@ WHERE 1=1
{
builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Class_Time_ViewModel.ClassId), query.QClassIds);
}
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
}
if (query.School_Id > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
}
}
return Get<RB_Class_Time_ViewModel>(builder.ToString()).ToList();
}
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ a08a7b87
......@@ -126,7 +126,7 @@ namespace Edu.WebApi.Controllers.Course
OutRemark = base.ParmJObj.GetStringValue("OutRemark"),
CompleteProgress = base.ParmJObj.GetInt("CompleteProgress"),
School_Id = base.ParmJObj.GetInt("School_Id"),
ClassType=base.ParmJObj.GetInt("ClassType"),
ClassType = base.ParmJObj.GetInt("ClassType"),
};
try
{
......@@ -309,7 +309,7 @@ namespace Edu.WebApi.Controllers.Course
};
if (classModule.CheckPlanModule(extModel))
{
return ApiResult.Failed(message: "已经存在【"+Common.ConvertHelper.FormatDate(extModel.ClassDate)+"】的上课安排!请删除后再操作!");
return ApiResult.Failed(message: "已经存在【" + Common.ConvertHelper.FormatDate(extModel.ClassDate) + "】的上课安排!请删除后再操作!");
}
extModel.School_Id = classModule.GetClassModule(extModel.ClassId)?.School_Id ?? 0;
try
......@@ -372,7 +372,7 @@ namespace Edu.WebApi.Controllers.Course
{
var classId = base.ParmJObj.GetInt("ClassId");
var classPlanId = base.ParmJObj.GetInt("ClassPlanId");
var schoolId = base.ParmJObj.GetInt("SchoolId");
var schoolId = base.ParmJObj.GetInt("School_Id");
if (classId == 0 || classPlanId == 0 || schoolId == 0)
{
return ApiResult.ParamIsNull();
......@@ -382,7 +382,21 @@ namespace Edu.WebApi.Controllers.Course
{
return ApiResult.Failed("数据不存在");
}
return ApiResult.Success(data: new { data.TeacherName, data.RoomName, ClassDate = data.ClassDate.ToString("yyyy-MM-dd") });
double totalMinutes = 0;
var planTimeList = classModule.GetClassTimeListRepository(new RB_Class_Time_ViewModel { ClassId = classId, ClassPlanId = classPlanId, Group_Id = base.UserInfo.Group_Id, School_Id = schoolId });
if (planTimeList != null && planTimeList.Any())
{
foreach (var item in planTimeList)
{
if (!string.IsNullOrWhiteSpace(item.StartTime) && !string.IsNullOrWhiteSpace(item.EndTime))
{
System.TimeSpan timeInfo = Convert.ToDateTime(data.ClassDate.ToString("yyyy-MM-dd") + " " + item.EndTime) - Convert.ToDateTime(data.ClassDate.ToString("yyyy-MM-dd") + " " + item.StartTime);
totalMinutes += timeInfo.TotalMinutes;
}
}
}
return ApiResult.Success(data: new { data.TeacherName, data.RoomName, TotalHour = (totalMinutes / 60).ToString("f2"), ClassNum = (totalMinutes / 45).ToString("f2"), ClassDate = data.ClassDate.ToString("yyyy-MM-dd") });
}
/// <summary>
......@@ -417,6 +431,10 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult AddClassStudent()
{
var model = Common.Plugin.JsonHelper.DeserializeObject<RB_Order_Guest_ViewModel>(RequestParm.Msg.ToString());
if (!string.IsNullOrWhiteSpace(model.BirthDay))
{
model.Age = System.DateTime.Now.Year - Convert.ToDateTime(model.BirthDay).Year;
}
model.GuestState = 1;
model.GuestSource = OrderSourceEnum.Employee;
model.CreateBy = base.UserInfo.Id;
......@@ -438,7 +456,8 @@ namespace Edu.WebApi.Controllers.Course
{
Group_Id = base.UserInfo.Group_Id,
School_Id = base.ParmJObj.GetInt("School_Id"),
ClassId = base.ParmJObj.GetInt("ClassId")
ClassId = base.ParmJObj.GetInt("ClassId"),
TeacherId = base.ParmJObj.GetInt("TeacherId")
};
var list = classModule.GetClassPlanLogPageListRepository(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<RB_Class_Check_ViewModel> checkLogList = new List<RB_Class_Check_ViewModel>();
......@@ -449,6 +468,7 @@ namespace Edu.WebApi.Controllers.Course
List<object> resultList = new List<object>();
var dateList = list.GroupBy(x => new { MonthStr= x.ClassDate.ToString("MM"), YearStr= x.ClassDate.ToString("yyyy") }).Select(x=>new { x.Key.MonthStr, x.Key.YearStr });
foreach (var item in list)
{
int totalNum = checkLogList.Where(x => x.ClassId == item.ClassId && x.ClassRoomId == item.ClassRoomId && x.Group_Id == item.Group_Id && x.School_Id == item.School_Id).Count();
......@@ -468,8 +488,9 @@ namespace Edu.WebApi.Controllers.Course
};
resultList.Add(planCheckObj);
}
var result = new { dateList, resultList };
pageModel.Count = rowsCount;
pageModel.PageData = resultList;
pageModel.PageData = result;
return ApiResult.Success(data: pageModel);
}
......
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