Skip to content

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

页面修改

parent b8678149
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 27 deletions
Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs
View file @ f42b1094
...@@ -73,7 +73,6 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -73,7 +73,6 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary> /// </summary>
public List<ChangePlanItem> OldChangePlanItemList { get; set; } public List<ChangePlanItem> OldChangePlanItemList { get; set; }
/// <summary> /// <summary>
/// 调整新数据信息 /// 调整新数据信息
/// </summary> /// </summary>
...@@ -97,22 +96,35 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -97,22 +96,35 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary> /// </summary>
public DateTime ClassDate { get; set; } public DateTime ClassDate { get; set; }
/// <summary>
/// 上课时间
/// </summary>
public string ClassDateStr { get { return Common.ConvertHelper.FormatDate(this.ClassDate); } }
/// <summary> /// <summary>
/// 老师编号 /// 老师编号
/// </summary> /// </summary>
public int TeacherId { get; set; } public int TeacherId { get; set; }
/// <summary>
/// 教师姓名
/// </summary>
public string TeacherName { get; set; }
/// <summary> /// <summary>
/// 教室编号 /// 教室编号
/// </summary> /// </summary>
public int ClassRoomId { get; set; } public int ClassRoomId { get; set; }
/// <summary>
/// 教师名称
/// </summary>
public string ClassRoomName { get; set; }
/// <summary> /// <summary>
///班级计划上课日期的上课时间表 ///班级计划上课日期的上课时间表
/// </summary> /// </summary>
public List<Course.RB_Class_Time_ViewModel> PlanTimeList { get; set; } public List<Course.RB_Class_Time_ViewModel> PlanTimeList { get; set; }
} }
...@@ -131,6 +143,7 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -131,6 +143,7 @@ namespace Edu.Model.ViewModel.EduTask
/// 课时分钟数 /// 课时分钟数
/// </summary> /// </summary>
public int ClassHourMinute { get; set; } public int ClassHourMinute { get; set; }
/// <summary> /// <summary>
/// 开课时间 /// 开课时间
/// </summary> /// </summary>
...@@ -141,11 +154,21 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -141,11 +154,21 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary> /// </summary>
public int TeacherId { get; set; } public int TeacherId { get; set; }
/// <summary>
/// 老师姓名
/// </summary>
public string TeacherName { get; set; }
/// <summary> /// <summary>
/// 教室编号 /// 教室编号
/// </summary> /// </summary>
public int ClassRoomId { get; set; } public int ClassRoomId { get; set; }
/// <summary>
/// 教师名称
/// </summary>
public string ClassRoomName { get; set; }
/// 选中的周几/或日期数组 /// 选中的周几/或日期数组
/// </summary> /// </summary>
public List<string> WeekDayList { get; set; } public List<string> WeekDayList { get; set; }
...@@ -155,22 +178,12 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -155,22 +178,12 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary> /// </summary>
public List<ClassTimeItem> DefaultTimeList { get; set; } public List<ClassTimeItem> DefaultTimeList { get; set; }
/// <summary>
/// 默认选中的日期、周
/// </summary>
//public string DateJson { get; set; }
/// <summary> /// <summary>
/// 排课方式(1-周，2-月，3-固定日期，4-约课) /// 排课方式(1-周，2-月，3-固定日期，4-约课)
/// </summary> /// </summary>
public Common.Enum.Course.ClassStyleEnum ClassStyle { get; set; } public Common.Enum.Course.ClassStyleEnum ClassStyle { get; set; }
/// <summary>
/// 默认时间字符串JSON
/// </summary>
// public string DefaultTimeJson { get; set; }
} }
///<summary> ///<summary>
......
Edu.Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs
View file @ f42b1094
...@@ -24,5 +24,20 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -24,5 +24,20 @@ namespace Edu.Model.ViewModel.EduTask
/// 班级编号 /// 班级编号
/// </summary> /// </summary>
public string ClassNo { get; set; } public string ClassNo { get; set; }
/// <summary>
/// 老师姓名
/// </summary>
public string TeacherName { get; set; }
/// <summary>
/// 学校名称
/// </summary>
public string SchoolName { get; set; }
/// <summary>
/// 课程名称
/// </summary>
public string CourseName { get; set; }
} }
} }
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ f42b1094
...@@ -8,6 +8,7 @@ using Edu.Model.Entity.Course; ...@@ -8,6 +8,7 @@ using Edu.Model.Entity.Course;
using Edu.Model.Entity.EduTask; using Edu.Model.Entity.EduTask;
using Edu.Model.ViewModel.Course; using Edu.Model.ViewModel.Course;
using Edu.Model.ViewModel.EduTask; using Edu.Model.ViewModel.EduTask;
using Edu.Model.ViewModel.User;
using Edu.Repository.Course; using Edu.Repository.Course;
using Edu.Repository.EduTask; using Edu.Repository.EduTask;
using Edu.Repository.User; using Edu.Repository.User;
...@@ -49,6 +50,16 @@ namespace Edu.Module.EduTask ...@@ -49,6 +50,16 @@ namespace Edu.Module.EduTask
/// </summary> /// </summary>
private readonly RB_Change_ClassPlanRepository change_ClassPlanRepository = new RB_Change_ClassPlanRepository(); private readonly RB_Change_ClassPlanRepository change_ClassPlanRepository = new RB_Change_ClassPlanRepository();
/// <summary>
/// 老师仓储层对象
/// </summary>
private readonly RB_TeacherRepository teacherRepository = new RB_TeacherRepository();
/// <summary>
/// 教室仓储层对象
/// </summary>
private readonly RB_Class_RoomRepository class_RoomRepository = new RB_Class_RoomRepository();
/// <summary> /// <summary>
/// 获取教务单据分页列表 /// 获取教务单据分页列表
/// </summary> /// </summary>
...@@ -67,6 +78,10 @@ namespace Edu.Module.EduTask ...@@ -67,6 +78,10 @@ namespace Edu.Module.EduTask
List<RB_Student_BackClass_ViewModel> backClassLisit = new List<RB_Student_BackClass_ViewModel>(); List<RB_Student_BackClass_ViewModel> backClassLisit = new List<RB_Student_BackClass_ViewModel>();
//调课申请 //调课申请
List<RB_Change_ClassPlan_ViewModel> changeClassList = new List<RB_Change_ClassPlan_ViewModel>(); List<RB_Change_ClassPlan_ViewModel> changeClassList = new List<RB_Change_ClassPlan_ViewModel>();
//老师列表
List<RB_Teacher_ViewModel> teacherList = new List<RB_Teacher_ViewModel>();
//教室列表
List<RB_Class_Room_ViewModel> roomList = new List<RB_Class_Room_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)); string Ids = string.Join(",", list.Select(qitem => qitem.Id));
var relevanceList = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel() var relevanceList = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel()
...@@ -90,6 +105,80 @@ namespace Edu.Module.EduTask ...@@ -90,6 +105,80 @@ namespace Edu.Module.EduTask
{ {
Q_Change_ClassPlan_Ids = changeIds Q_Change_ClassPlan_Ids = changeIds
}); });
List<int> teacherIds = new List<int>();
List<int> classRoomIds = new List<int>();
if (changeClassList != null && changeClassList.Count > 0)
{
foreach (var tempModel in changeClassList)
{
if (tempModel != null)
{
if (!string.IsNullOrEmpty(tempModel.SourceData))
{
tempModel.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(tempModel.SourceData);
if (tempModel.OldChangePlanItemList != null && tempModel.OldChangePlanItemList.Count > 0)
{
var tempTeacherIds = Common.ConvertHelper.StringToList(string.Join(",", tempModel.OldChangePlanItemList.Select(qitem => qitem.TeacherId)));
if (tempTeacherIds != null && tempTeacherIds.Count > 0)
{
teacherIds.AddRange(teacherIds);
}
var tempClassRoomIds = Common.ConvertHelper.StringToList(string.Join(",", tempModel.OldChangePlanItemList.Select(qitem => qitem.ClassRoomId)));
if (tempClassRoomIds != null && tempClassRoomIds.Count > 0)
{
classRoomIds.AddRange(classRoomIds);
}
}
}
if (!string.IsNullOrEmpty(tempModel.TargetData))
{
if (tempModel.MoveType == 1)
{
tempModel.NewChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(tempModel.TargetData);
if (tempModel.NewChangePlanItemList != null && tempModel.NewChangePlanItemList.Count > 0)
{
var tempNTeacherIds = Common.ConvertHelper.StringToList(string.Join(",", tempModel.NewChangePlanItemList.Select(qitem => qitem.TeacherId)));
if (tempNTeacherIds != null && tempNTeacherIds.Count > 0)
{
teacherIds.AddRange(tempNTeacherIds);
}
var tempNClassRoomIds = Common.ConvertHelper.StringToList(string.Join(",", tempModel.NewChangePlanItemList.Select(qitem => qitem.ClassRoomId)));
if (tempNClassRoomIds != null && tempNClassRoomIds.Count > 0)
{
classRoomIds.AddRange(tempNClassRoomIds);
}
}
}
else if (tempModel.MoveType == 2)
{
tempModel.AllChangePlanModel = Common.Plugin.JsonHelper.DeserializeObject<AllChangePlanItem>(tempModel.TargetData);
if (tempModel.AllChangePlanModel != null && tempModel.AllChangePlanModel.TeacherId > 0)
{
teacherIds.Add(tempModel.AllChangePlanModel.TeacherId);
}
if (tempModel.AllChangePlanModel != null && tempModel.AllChangePlanModel.ClassRoomId > 0)
{
classRoomIds.Add(tempModel.AllChangePlanModel.ClassRoomId);
}
}
}
}
}
}
if (teacherIds != null && teacherIds.Count > 0)
{
teacherList= teacherRepository.GetTeacherListRepository(new Model.ViewModel.User.RB_Teacher_ViewModel()
{
QTIds = string.Join(",", teacherIds)
});
}
if (classRoomIds != null && classRoomIds.Count > 0)
{
roomList = class_RoomRepository.GetClassRoomListRepository(new RB_Class_Room_ViewModel()
{
QRoomIds = string.Join(",", classRoomIds)
});
}
} }
} }
foreach (var item in list) foreach (var item in list)
...@@ -104,24 +193,27 @@ namespace Edu.Module.EduTask ...@@ -104,24 +193,27 @@ namespace Edu.Module.EduTask
if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass) if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
{ {
var tempModel = changeClassList.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault(); var tempModel = changeClassList.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault();
if (tempModel != null ) if (tempModel.OldChangePlanItemList != null && tempModel.OldChangePlanItemList.Count > 0)
{ {
if (!string.IsNullOrEmpty(tempModel.SourceData)) foreach (var sItem in tempModel.OldChangePlanItemList)
{ {
tempModel.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(tempModel.SourceData); sItem.TeacherName = teacherList?.Where(qitem => qitem.TId == sItem.TeacherId)?.FirstOrDefault()?.TeacherName ?? "";
sItem.ClassRoomName = roomList?.Where(qitem => qitem.RoomId == sItem.ClassRoomId)?.FirstOrDefault()?.RoomName ?? "";
} }
if (!string.IsNullOrEmpty(tempModel.TargetData)) }
if (tempModel.NewChangePlanItemList != null && tempModel.NewChangePlanItemList.Count > 0)
{
foreach (var sItem in tempModel.NewChangePlanItemList)
{ {
if (tempModel.MoveType == 1) sItem.TeacherName = teacherList?.Where(qitem => qitem.TId == sItem.TeacherId)?.FirstOrDefault()?.TeacherName ?? "";
{ sItem.ClassRoomName = roomList?.Where(qitem => qitem.RoomId == sItem.ClassRoomId)?.FirstOrDefault()?.RoomName ?? "";
tempModel.NewChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(tempModel.TargetData);
}
else if (tempModel.MoveType == 2)
{
tempModel.AllChangePlanModel = Common.Plugin.JsonHelper.DeserializeObject<AllChangePlanItem>(tempModel.TargetData);
}
} }
} }
if (tempModel.AllChangePlanModel != null)
{
tempModel.AllChangePlanModel.TeacherName= teacherList?.Where(qitem => qitem.TId == tempModel.AllChangePlanModel.TeacherId)?.FirstOrDefault()?.TeacherName ?? "";
tempModel.AllChangePlanModel.ClassRoomName = roomList?.Where(qitem => qitem.RoomId == tempModel.AllChangePlanModel.ClassRoomId)?.FirstOrDefault()?.RoomName ?? "";
}
DataObj = tempModel; DataObj = tempModel;
} }
var obj = new var obj = new
...@@ -139,6 +231,9 @@ namespace Edu.Module.EduTask ...@@ -139,6 +231,9 @@ namespace Edu.Module.EduTask
ReceiptTypeName = item.ReceiptType.ToName(), ReceiptTypeName = item.ReceiptType.ToName(),
CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName, CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName,
CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime), CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
item.TeacherName,
item.SchoolName,
item.CourseName,
AuditStatusName = item.VerifyStatus == Common.Enum.User.WFRrocessStatus.NotAudit ? "审核中" : item.VerifyStatus.ToName(), AuditStatusName = item.VerifyStatus == Common.Enum.User.WFRrocessStatus.NotAudit ? "审核中" : item.VerifyStatus.ToName(),
}; };
result.Add(obj); result.Add(obj);
......
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @ f42b1094
...@@ -66,9 +66,13 @@ namespace Edu.Repository.EduTask ...@@ -66,9 +66,13 @@ namespace Edu.Repository.EduTask
} }
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo {0} SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo,IFNULL(C.TeacherName,'') AS TeacherName
,IFNULL(D.SName,'') AS SchoolName,IFNULL(E.CourseName,'') AS CourseName {0}
FROM RB_Education_Receipt AS A LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId FROM RB_Education_Receipt AS A LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
WHERE 1=1 LEFT JOIN rb_teacher AS C ON B.Teacher_Id=C.TId
LEFT JOIN rb_school AS D ON A.School_Id=D.SId
LEFT JOIN rb_course AS E ON B.CouseId=E.CourseId
WHERE 1=1
", isSpecNode); ", isSpecNode);
if (query != null) if (query != null)
{ {
......
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