Skip to content

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

新增学员排课配置

parent 7adc18e8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 532 additions and 107 deletions
Edu.Model/Entity/Scroll/RB_Scroll_PlanShow.cs 0 → 100644
View file @ 306873b5
using Edu.Common.Enum;
using System;
using VT.FW.DB;
namespace Edu.Model.Entity.Scroll
{
/// <summary>
/// 学员排课显示设置实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Scroll_PlanShow
{
/// <summary>
/// 主键Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 学员Id(RB_Student表ID)
/// </summary>
public int StuId { get; set; }
/// <summary>
/// 订单学员ID(RB_Order_Guest表ID)
/// </summary>
public int GuestId { get; set; }
/// <summary>
/// 订单ID
/// </summary>
public int OrderId { get; set; }
/// <summary>
/// 显示的排课等级(N5,N4,N3..多选)
/// </summary>
public string ShowRetes { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 修改人
/// </summary>
public int UpdateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateTime { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
}
}
Edu.Model/ViewModel/Scroll/RB_Scroll_PlanShow_ViewModel.cs 0 → 100644
View file @ 306873b5
using Edu.Model.Entity.Scroll;
namespace Edu.Model.ViewModel.Scroll
{
/// <summary>
/// 学员排课显示设置扩展实体类
/// </summary>
public class RB_Scroll_PlanShow_ViewModel: RB_Scroll_PlanShow
{
/// <summary>
/// 学生ID(RB_Student表ID)
/// </summary>
public string QStuIds { get; set; }
/// <summary>
/// 订单学员ID(RB_Order_Guest表ID)
/// </summary>
public string QGuestIds { get; set; }
/// <summary>
/// 订单ID
/// </summary>
public string QOrderIds { get; set; }
}
}
Edu.Model/ViewModel/Scroll/ScheduleQuery.cs
View file @ 306873b5
using Edu.Common.Enum.Course;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Model.ViewModel.Scroll
{
......@@ -69,4 +67,17 @@ namespace Edu.Model.ViewModel.Scroll
/// </summary>
public string GuestName { get; set; }
}
/// <summary>
/// 学员排课设置查询条件
/// </summary>
[Serializable]
public class ScrollPlanShowQuery
{
/// <summary>
/// 学员名称
/// </summary>
public string StuName { get; set; }
}
}
Edu.Model/ViewModel/Scroll/ScheduleResult.cs
View file @ 306873b5
......@@ -295,5 +295,68 @@ namespace Edu.Model.ViewModel.Scroll
public AttendanceMethodEnum AttendanceMethod { get; set; }
}
/// <summary>
/// 学员排课设置查询结果
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class ScrollPlanShowResult
{
/// <summary>
/// 学员Id(rb_student表StuId)
/// </summary>
public int StuId { get; set; }
/// <summary>
/// 学员名称(rb_student表StuName)
/// </summary>
public string StuName { get; set;}
/// <summary>
/// 订单学员编号(rb_order_guest表Id)
/// </summary>
public string GuestId { get; set; }
/// <summary>
/// 订单编号
/// </summary>
public string OrderId { get; set; }
/// <summary>
/// 订单课程Id
/// </summary>
public int CourseId { get; set; }
/// <summary>
/// 订单关联课程Id(逗号分隔)
/// </summary>
public string OrderCourseIds { get; set; }
/// <summary>
/// 学员报名所有课程等级
/// </summary>
public List<ShowRateItem> AllReteList { get; set; }
public string
}
/// <summary>
/// 学员报入所有课程等级
/// </summary>
[Serializable]
public class ShowRateItem
{
/// <summary>
/// 等级Id
/// </summary>
public int RateId { get; set; }
/// <summary>
/// 等级名称
/// </summary>
public string RateName { get; set; }
}
}
Edu.Module.Course/ClassModule.cs
View file @ 306873b5
......@@ -4297,10 +4297,6 @@ namespace Edu.Module.Course
}
}
}
if (sItem.StuName == "韩梦逸")
{
string str = "";
}
appointGuestList.Add(new
{
GuestName = sItem.StuName,
......@@ -5358,6 +5354,11 @@ namespace Edu.Module.Course
/// 获取下节新词+复习词汇
/// </summary>
/// <param name="classId"></param>
/// <param name="courseId"></param>
/// <param name="guestId"></param>
/// <param name="classScrollType"></param>
/// <param name="stuId"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public object GetIndexWords(int classId, int courseId, int guestId, int classScrollType, int stuId, int groupId)
{
......
Edu.Module.Course/ScheduleCourseModule.cs
View file @ 306873b5
......@@ -32,15 +32,16 @@ namespace Edu.Module.Course
/// <summary>
/// 排课相关处理类
/// </summary>
private ScheduleCourseRepository scheduleCourseRepository = new ScheduleCourseRepository();
private RB_AccountRepository accountRepository = new RB_AccountRepository();
private RB_Order_GuestRepository guestRepository = new RB_Order_GuestRepository();
private RB_Class_CheckRepository checkRepository = new RB_Class_CheckRepository();
private RB_CourseRepository courseRepository = new RB_CourseRepository();
private RB_Class_RoomRepository class_RoomRepository = new RB_Class_RoomRepository();
private RB_Scroll_AppointmentRepository appointmentRepository = new RB_Scroll_AppointmentRepository();
private RB_Order_CourseRepository order_CourseRepository = new RB_Order_CourseRepository();
private RB_Course_ChapterRepository course_ChapterRepository = new RB_Course_ChapterRepository();
private readonly ScheduleCourseRepository scheduleCourseRepository = new ScheduleCourseRepository();
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
private readonly RB_Order_GuestRepository guestRepository = new RB_Order_GuestRepository();
private readonly RB_Class_CheckRepository checkRepository = new RB_Class_CheckRepository();
private readonly RB_CourseRepository courseRepository = new RB_CourseRepository();
private readonly RB_Class_RoomRepository class_RoomRepository = new RB_Class_RoomRepository();
private readonly RB_Scroll_AppointmentRepository appointmentRepository = new RB_Scroll_AppointmentRepository();
private readonly RB_Order_CourseRepository order_CourseRepository = new RB_Order_CourseRepository();
private readonly RB_Course_ChapterRepository course_ChapterRepository = new RB_Course_ChapterRepository();
private readonly RB_Scroll_PlanShowRepository scroll_PlanShowRepository = new RB_Scroll_PlanShowRepository();
/// <summary>
/// 排课计划表
......@@ -131,13 +132,10 @@ namespace Edu.Module.Course
}
foreach (var item in list)
{
if (item.GuestName == "测试甲")
List<int> tempCourseIdList = new List<int>
{
string str = "";
}
List<int> tempCourseIdList = new List<int>();
tempCourseIdList.Add(item.CourseId);
item.CourseId
};
var tempOrderCourse = orderCourseList?.Where(qitem => qitem.OrderId == item.OrderId)?.ToList();
if (tempOrderCourse != null && tempOrderCourse.Count > 0)
{
......@@ -228,6 +226,22 @@ namespace Edu.Module.Course
return dataList;
}
/// <summary>
/// 查询学员排课设置结果
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<ScrollPlanShowResult> GetStuPlanShowListModule(ScrollPlanShowQuery query)
{
var list = scheduleCourseRepository.GetStuPlanShowListRepository(query);
if (list != null && list.Count > 0)
{
}
return list;
}
/// <summary>
/// 获取课程名称缩写
/// </summary>
......@@ -434,5 +448,36 @@ namespace Edu.Module.Course
}
return obj;
}
/// <summary>
/// 获取学员排课显示设置列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Scroll_PlanShow_ViewModel> GetScrollPlanShowListModule(RB_Scroll_PlanShow_ViewModel query)
{
return scroll_PlanShowRepository.GetScrollPlanShowListRepository(query);
}
/// <summary>
/// 设置学员显示排课等级
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetScrollPlanShowModule(RB_Scroll_PlanShow_ViewModel model)
{
return scroll_PlanShowRepository.SetScrollPlanShowRepository(model);
}
/// <summary>
/// 删除学员排课设置
/// </summary>
/// <param name="Id"></param>
/// <param name="UpdateBy"></param>
/// <returns></returns>
public bool RemoveScrollPlanShowModule(int Id, int UpdateBy)
{
return scroll_PlanShowRepository.RemoveScrollPlanShowRepository(Id, UpdateBy);
}
}
}
Edu.Module.Course/ScrollClassModule.cs
View file @ 306873b5
......@@ -2344,8 +2344,10 @@ namespace Edu.Module.Course
demodel.AccountId = teacherModel?.AccountId ?? 0;
//验证当日老师的数据
var planList = new List<RB_Scroll_Plan_ViewModel>();
planList.Add(new RB_Scroll_Plan_ViewModel() { ShiftId = 9 });
var planList = new List<RB_Scroll_Plan_ViewModel>
{
new RB_Scroll_Plan_ViewModel() { ShiftId = 9 }
};
// planList= scroll_PlanRepository.GetList(new RB_Scroll_Plan_ViewModel() { Group_Id = demodel.Group_Id, AccountId = demodel.AccountId, STime = Date, ETime = Date });
//if (!planList.Any())
......@@ -2628,8 +2630,10 @@ namespace Edu.Module.Course
bool flag = AppointId > 0;
if (flag)
{
List<RB_Scroll_Appointment_ViewModel> list = new List<RB_Scroll_Appointment_ViewModel>();
list.Add(demodel);
List<RB_Scroll_Appointment_ViewModel> list = new List<RB_Scroll_Appointment_ViewModel>
{
demodel
};
class_CheckRepository.AppointStuCheckRepository(list, 2);
}
return flag ? "" : "出错了，请联系管理员";
......@@ -3545,8 +3549,10 @@ namespace Edu.Module.Course
var ogModel = ogList.Where(x => x.OrderId == item.OrderId).FirstOrDefault();
var oguestModel = orderGuestList.Where(x => x.Id == ogModel.GuestId).FirstOrDefault();
//根据课程Id 查询 上课课程
List<int> courseIdList = new List<int>();
courseIdList.Add(item.CourseId);
List<int> courseIdList = new List<int>
{
item.CourseId
};
var tempCourseList = orderCourseList?.Where(qitem => qitem.OrderId == item.OrderId)?.Select(qitem => qitem.CourseId)?.ToList()?.Distinct();
if (tempCourseList != null && tempCourseList.Count() > 0)
{
......@@ -3800,7 +3806,7 @@ namespace Edu.Module.Course
{
CourseRateName = (courseModel?.CourseId ?? 0) > 0 ? courseModel?.CourseRate.ToName() : "",
StudyID = x?.ID ?? 0,
StudyType = x.StudyType,
StudyType = x?.StudyType??0,
Words = x?.Words ?? "",
Practice = x?.Practice ?? "",
ReadingAloud = x?.ReadingAloud ?? "",
......
Edu.Module.Course/SellAchievementsModule.cs
View file @ 306873b5
......@@ -3348,7 +3348,7 @@ namespace Edu.Module.Course
}
RList.Add(new
{
EmpId = item.EmpId,
EmpId = item?.EmpId ?? 0,
DeptName = empModel?.DeptName ?? "",
RoleName = item.Type == 1 ? "市场" + (item.IsDept == 1 ? "/部门" : "") : item.Type == 2 ? "顾问" + (item.IsDept == 1 ? "/部门" : "") : "教师" + (item.IsDept == 1 ? "/部门" : ""),
EmpName = empModel?.EmployeeName ?? "",
......@@ -3486,7 +3486,7 @@ namespace Edu.Module.Course
}
RList.Add(new
{
EmpId = item.EmpId,
EmpId = item?.EmpId??0,
DeptName = empModel?.DeptName ?? "",
RoleName = item.Type == 1 ? "市场" + (item.IsDept == 1 ? "/部门" : "") : item.Type == 2 ? "顾问" + (item.IsDept == 1 ? "/部门" : "") : "教师" + (item.IsDept == 1 ? "/部门" : ""),
EmpName = empModel?.EmployeeName ?? "",
......@@ -3802,7 +3802,7 @@ namespace Edu.Module.Course
RList.Add(new
{
EmpId = empModel.Id,
DeptName = empModel.DeptName,
DeptName = empModel?.DeptName??"",
RoleName = empModel.UserRole > 0 ? empModel.UserRole.ToName() : empModel.PostName,
EmpName = empModel?.EmployeeName ?? "",
MonthList,
......@@ -3871,7 +3871,7 @@ namespace Edu.Module.Course
}
RList.Add(new
{
EmpId = item.EmpId,
EmpId = item?.EmpId??0,
DeptName = empModel?.DeptName ?? "",
RoleName = item.Type == 1 ? "市场" + (item.IsDept == 1 ? "/部门" : "") : item.Type == 2 ? "顾问" + (item.IsDept == 1 ? "/部门" : "") : "教师" + (item.IsDept == 1 ? "/部门" : ""),
EmpName = empModel?.EmployeeName ?? "",
......@@ -4019,7 +4019,7 @@ namespace Edu.Module.Course
RList.Add(new
{
EmpId = empModel.Id,
DeptName = empModel.DeptName,
DeptName = empModel?.DeptName??"",
RoleName = empModel.UserRole > 0 ? empModel.UserRole.ToName() : empModel.PostName,
EmpName = empModel?.EmployeeName ?? "",
MonthList,
......@@ -4098,7 +4098,7 @@ namespace Edu.Module.Course
}
RList.Add(new
{
EmpId = dmodel.EmpId,
EmpId = dmodel?.EmpId??0,
DeptName = empModel?.DeptName ?? "",
RoleName = dmodel.Type == 1 ? "市场" + (dmodel.IsDept == 1 ? "/部门" : "") : dmodel.Type == 2 ? "顾问" + (dmodel.IsDept == 1 ? "/部门" : "") : "教师" + (dmodel.IsDept == 1 ? "/部门" : ""),
EmpName = empModel?.EmployeeName ?? "",
......
Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs
View file @ 306873b5
......@@ -174,7 +174,6 @@ WHERE 1=1 AND c.Status=0 AND NOT(CONCAT(substring(C.ClassDate,1,10),' ',C.ClassT
/// <returns></returns>
public List<RB_Reserve_Class_Extend> ExistsReserveClassListRepository(RB_Reserve_Class_Extend query)
{
int result = 0;
var startTime = query.ClassDateStr + " " + query.ClassTime + ":00";
var endTime = query.ClassDateStr + " " + query.EndTime + ":00";
StringBuilder builder = new StringBuilder();
......
Edu.Repository/Scroll/RB_Scroll_PlanShowRepository.cs 0 → 100644
View file @ 306873b5
using Edu.Common.Enum;
using Edu.Model.Entity.Scroll;
using Edu.Model.ViewModel.Scroll;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using VT.FW.DB;
namespace Edu.Repository.Scroll
{
/// <summary>
/// 学员排课显示设置仓储层
/// </summary>
public class RB_Scroll_PlanShowRepository:BaseRepository<RB_Scroll_PlanShow>
{
/// <summary>
/// 获取学员排课显示设置列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Scroll_PlanShow_ViewModel> GetScrollPlanShowListRepository(RB_Scroll_PlanShow_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM RB_Scroll_PlanShow AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Scroll_PlanShow_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.StuId > 0)
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Scroll_PlanShow_ViewModel.StuId), query.StuId);
}
if (!string.IsNullOrEmpty(query.QStuIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Scroll_PlanShow_ViewModel.StuId), query.QStuIds);
}
if (query.GuestId > 0)
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Scroll_PlanShow_ViewModel.GuestId), query.GuestId);
}
if (!string.IsNullOrEmpty(query.QGuestIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Scroll_PlanShow_ViewModel.GuestId), query.QGuestIds);
}
if (query.OrderId > 0)
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Scroll_PlanShow_ViewModel.OrderId), query.OrderId);
}
if (!string.IsNullOrEmpty(query.QOrderIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Scroll_PlanShow_ViewModel.OrderId), query.QOrderIds);
}
}
return Get<RB_Scroll_PlanShow_ViewModel>(builder.ToString()).ToList();
}
/// <summary>
/// 设置学员显示排课等级
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetScrollPlanShowRepository(RB_Scroll_PlanShow_ViewModel model)
{
bool flag = false;
var oldModel = GetScrollPlanShowListRepository(new RB_Scroll_PlanShow_ViewModel() { GuestId = model.GuestId, OrderId = model.OrderId, StuId = model.StuId })?.FirstOrDefault();
model.Id = oldModel?.Id ?? 0;
if (model.Id > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Scroll_PlanShow_ViewModel.ShowRetes),model.ShowRetes },
{nameof(RB_Scroll_PlanShow_ViewModel.UpdateBy),model.UpdateBy },
{nameof(RB_Scroll_PlanShow_ViewModel.UpdateTime),model.UpdateTime },
};
flag = base.Update(fileds, new WhereHelper(nameof(RB_Scroll_PlanShow_ViewModel.Id), model.Id));
}
else
{
var newId = base.Insert(model);
model.Id = newId;
flag = newId > 0;
}
return flag;
}
/// <summary>
/// 删除学员排课设置
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool RemoveScrollPlanShowRepository(int Id, int UpdateBy)
{
bool flag = false;
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Scroll_PlanShow_ViewModel.Status), (int)DateStateEnum.Delete },
{nameof(RB_Scroll_PlanShow_ViewModel.UpdateBy),UpdateBy },
{nameof(RB_Scroll_PlanShow_ViewModel.UpdateTime),DateTime.Now },
};
flag = base.Update(fileds, new WhereHelper(nameof(RB_Scroll_PlanShow_ViewModel.Id), Id));
return flag;
}
}
}
Edu.Repository/Scroll/ScheduleCourseRepository.cs
View file @ 306873b5
......@@ -155,5 +155,36 @@ WHERE 1=1 AND A.State IN(3) AND A.AppointType IN(1,2)
var list = base.GetPage<ScrollAppointmentResult>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
return list;
}
/// <summary>
/// 查询学员排课设置结果
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<ScrollPlanShowResult> GetStuPlanShowListRepository(ScrollPlanShowQuery query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT s.StuName,sog.Student_Id AS StuId,sog.OrderId,sog.GuestId,o.CourseId,IFNULL(oc.OrderCourseIds,'') AS OrderCourseIds,IFNULL(sps.ShowRetes,'') AS ShowRetes
FROM rb_student_orderguest AS sog LEFT JOIN rb_order_guest AS og ON sog.GuestId=og.Id
LEFT JOIN rb_order AS O ON sog.OrderId=o.OrderId
LEFT JOIN rb_student AS s ON sog.Student_Id=s.StuId
LEFT JOIN (SELECT OrderId,GROUP_CONCAT(CourseId) AS OrderCourseIds FROM rb_order_course GROUP BY OrderId) AS oc ON sog.OrderId=oc.OrderId
LEFT JOIN rb_class AS E ON O.ClassId=E.ClassId
LEFT JOIN rb_scroll_planshow AS sps ON sog.Student_Id=sps.StuId AND sog.GuestId=sps.OrderId AND sog.GuestId=sps.GuestId and sps.Status=0
WHERE 1=1 AND O.OrderState=1 AND O.OrderType=1 AND E.ClassScrollType=2
");
if (query != null)
{
if (!string.IsNullOrEmpty(query.StuName))
{
builder.AppendFormat(@" AND s.StuName LIKE @StuName ");
parameters.Add("StuName", "%" + query.StuName.Trim() + "%");
}
}
var list = Get<ScrollPlanShowResult>(builder.ToString(), parameters).ToList();
return list;
}
}
}
Edu.WebApi/Controllers/Course/ScheduleCourseController.cs
View file @ 306873b5
......@@ -116,6 +116,20 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.Success(data: list);
}
/// <summary>
/// 查询学员排课设置结果
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStuPlanShow()
{
var query = new ScrollPlanShowQuery()
{
StuName=base.ParmJObj.GetStringValue("StuName"),
};
var list = scheduleCourse.GetStuPlanShowListModule(query);
return ApiResult.Success(data: list);
}
/// <summary>
/// 获取学员预约上课计划
......@@ -238,5 +252,59 @@ namespace Edu.WebApi.Controllers.Course
pageModel.PageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取学员
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetScrollPlanShowList()
{
var query = new RB_Scroll_PlanShow_ViewModel()
{
StuId = base.ParmJObj.GetInt("StuId"),
GuestId = base.ParmJObj.GetInt("GuestId"),
OrderId = base.ParmJObj.GetInt("OrderId"),
};
var list = scheduleCourse.GetScrollPlanShowListModule(query);
return ApiResult.Success(data: list);
}
/// <summary>
/// 设置学员排课等级
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetScrollPlanShow()
{
var userInfo = base.UserInfo;
var model = new RB_Scroll_PlanShow_ViewModel()
{
StuId=base.ParmJObj.GetInt("StuId"),
GuestId=base.ParmJObj.GetInt("GuestId"),
OrderId=base.ParmJObj.GetInt("OrderId"),
ShowRetes=base.ParmJObj.GetStringValue("ShowRetes"),
};
model.Status = Common.Enum.DateStateEnum.Normal;
model.CreateBy = userInfo.Id;
model.CreateTime = DateTime.Now;
model.UpdateBy = userInfo.Id;
model.UpdateTime= DateTime.Now;
bool flag = scheduleCourse.SetScrollPlanShowModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 删除学员排课设置
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult RemoveScrollPlanShow()
{
var Id = base.ParmJObj.GetInt("Id");
var userInfo = base.UserInfo;
bool flag = scheduleCourse.RemoveScrollPlanShowModule(Id, userInfo.Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
}
}
Edu.WebApi/Controllers/Course/ScrollController.cs
View file @ 306873b5
......@@ -1141,11 +1141,11 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult GetStuLearnChapterList()
{
var userInfo = base.UserInfo;
RB_Scroll_Appointment_ViewModel demodel = new RB_Scroll_Appointment_ViewModel()
RB_Scroll_Appointment_ViewModel demodel = new RB_Scroll_Appointment_ViewModel
{
StuId=base.ParmJObj.GetInt("StuId"),
StuId = base.ParmJObj.GetInt("StuId"),
Group_Id = userInfo.Group_Id
};
demodel.Group_Id = userInfo.Group_Id;
var list = scrollClassModule.GetStuLearnChapterList(demodel);
return ApiResult.Success("", list);
}
......
Edu.WebApi/Controllers/Course/TeacherClassController.cs
View file @ 306873b5
......@@ -45,7 +45,7 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult GetClassPageList()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Class_ViewModel()
var query = new RB_Class_ViewModel
{
ClassName = base.ParmJObj.GetStringValue("ClassName"),
ClassStatus = (ClassStatusEnum)base.ParmJObj.GetInt("ClassStatus"),
......@@ -55,8 +55,8 @@ namespace Edu.WebApi.Controllers.Course
TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
CourseName = base.ParmJObj.GetStringValue("CourseName"),
CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
Group_Id = base.UserInfo.Group_Id
};
query.Group_Id = base.UserInfo.Group_Id;
List<object> result = new List<object>();
var list = classModule.GetClassPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
......@@ -307,8 +307,8 @@ namespace Edu.WebApi.Controllers.Course
ClassId = base.ParmJObj.GetInt("ClassId", 0),
CourseId = base.ParmJObj.GetInt("CourseId", 0),
EnterID = base.ParmJObj.GetInt("EnterID", 0),
Group_Id = base.UserInfo.Group_Id
};
model.Group_Id = base.UserInfo.Group_Id;
var list = classModule.GetNotClassStudentList(model);
List<object> result = new List<object>();
foreach (var item in list)
......@@ -819,11 +819,13 @@ namespace Edu.WebApi.Controllers.Course
var guestAppointList = appointList.Where(x => x.GuestId == item.Key).OrderBy(x => x.Date);
foreach (var itemGuest in guestAppointList)
{
List<ExcelColumn> excelColumns = new List<ExcelColumn>();
excelColumns.Add(new ExcelColumn(value: itemGuest.StuName) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
excelColumns.Add(new ExcelColumn(value: itemGuest.Date.ToString("MM月dd日")) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
excelColumns.Add(new ExcelColumn(value: Common.ConvertHelper.GetWeekDay(itemGuest.Date)) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
excelColumns.Add(new ExcelColumn(value: (itemGuest.CourseSTime ?? "") + "-" + (itemGuest.CourseETime ?? "")) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
List<ExcelColumn> excelColumns = new List<ExcelColumn>
{
new ExcelColumn(value: itemGuest.StuName) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: itemGuest.Date.ToString("MM月dd日")) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: Common.ConvertHelper.GetWeekDay(itemGuest.Date)) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: (itemGuest.CourseSTime ?? "") + "-" + (itemGuest.CourseETime ?? "")) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }
};
var tempChapter =new RB_Course_Chapter_ViewModel();
if (itemGuest.OrderCourseList != null && itemGuest.OrderCourseList.Count > 0)
......
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