Skip to content

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

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

parents d01e0533 12b5bbed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 865 additions and 1396 deletions
Edu.Model/ViewModel/User/RB_Employee_Extend.cs
View file @ 8110ffef
...@@ -128,6 +128,11 @@ namespace Edu.Model.ViewModel.User ...@@ -128,6 +128,11 @@ namespace Edu.Model.ViewModel.User
/// </summary> /// </summary>
public int SumScore { get; set; } public int SumScore { get; set; }
/// <summary>
/// 绑定的企业微信
/// </summary>
public string WorkUserId { get; set; }
} }
/// <summary> /// <summary>
/// 年假天数 /// 年假天数
......
Edu.Module.Course/ClassModule.cs
View file @ 8110ffef
This diff is collapsed.
Edu.Module.Course/OrderModule.cs
View file @ 8110ffef
...@@ -4917,57 +4917,57 @@ namespace Edu.Module.Course ...@@ -4917,57 +4917,57 @@ namespace Edu.Module.Course
public bool UpdateGuestStateModule() public bool UpdateGuestStateModule()
{ {
bool flag = false; bool flag = false;
var list = order_GuestRepository.UpdateGuestStateRepository(); //var list = order_GuestRepository.UpdateGuestStateRepository();
if (list != null && list.Count > 0) //if (list != null && list.Count > 0)
{ //{
string guestIds = string.Join(",", list.Select(qitem => qitem.Id)); // string guestIds = string.Join(",", list.Select(qitem => qitem.Id));
var checkList = class_CheckRepository.GetClassCheckList(new RB_Class_Check_ViewModel() { QOrderGuestIds = guestIds }); // var checkList = class_CheckRepository.GetClassCheckList(new RB_Class_Check_ViewModel() { QOrderGuestIds = guestIds });
int index = 1; // int index = 1;
foreach (var item in list) // foreach (var item in list)
{ // {
var guestCheckList = checkList.Where(qitem => qitem.OrderGuestId == item.Id); // var guestCheckList = checkList.Where(qitem => qitem.OrderGuestId == item.Id);
var totalHours = guestCheckList?.Sum(qitem => qitem.CurrentDeductionHours) ?? 0; // var totalHours = guestCheckList?.Sum(qitem => qitem.CurrentDeductionHours) ?? 0;
if (item.TotalHours != totalHours) // if (item.TotalHours != totalHours)
{ // {
decimal shengyu = item.TotalHours - totalHours; // decimal shengyu = item.TotalHours - totalHours;
var lastCheck = guestCheckList.OrderByDescending(qitem => qitem.ClassDate).FirstOrDefault(); // var lastCheck = guestCheckList.OrderByDescending(qitem => qitem.ClassDate).FirstOrDefault();
DateTime classDate = DateTime.Now; // DateTime classDate = DateTime.Now;
if (lastCheck != null && !string.IsNullOrEmpty(Common.ConvertHelper.FormatDate(lastCheck?.ClassDate))) // if (lastCheck != null && !string.IsNullOrEmpty(Common.ConvertHelper.FormatDate(lastCheck?.ClassDate)))
{ // {
classDate = lastCheck.ClassDate.AddDays(1); // classDate = lastCheck.ClassDate.AddDays(1);
} // }
var checkModel = new RB_Class_Check() // var checkModel = new RB_Class_Check()
{ // {
ClassCheckId = 0, // ClassCheckId = 0,
ClassId = 0, // ClassId = 0,
ClassDate = classDate, // ClassDate = classDate,
Status = 0, // Status = 0,
ClassRoomId = 0, // ClassRoomId = 0,
Group_Id = lastCheck?.Group_Id ?? 100000, // Group_Id = lastCheck?.Group_Id ?? 100000,
School_Id = 0, // School_Id = 0,
TeacherId = 0, // TeacherId = 0,
OrderGuestId = item.Id, // OrderGuestId = item.Id,
CheckStatus = 0, // CheckStatus = 0,
CreateBy = 0, // CreateBy = 0,
StudyNum = Convert.ToInt32(shengyu) * 45, // StudyNum = Convert.ToInt32(shengyu) * 45,
MakeUpStatus = 1, // MakeUpStatus = 1,
CurrentDeductionHours = shengyu, // CurrentDeductionHours = shengyu,
IsAbsentHours = 0, // IsAbsentHours = 0,
ClassTimeId = 0, // ClassTimeId = 0,
}; // };
checkModel.CreateTime = checkModel.ClassDate; // checkModel.CreateTime = checkModel.ClassDate;
class_CheckRepository.Insert(checkModel); // class_CheckRepository.Insert(checkModel);
} // }
Dictionary<string, object> fileds = new Dictionary<string, object>() // Dictionary<string, object> fileds = new Dictionary<string, object>()
{ // {
{nameof(RB_Order_Guest.CompleteHours),item.TotalHours }, // {nameof(RB_Order_Guest.CompleteHours),item.TotalHours },
{nameof(RB_Order_Guest.GuestState), (int)GuestStateEnum.Graduate}, // {nameof(RB_Order_Guest.GuestState), (int)GuestStateEnum.Graduate},
}; // };
flag = order_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_Order_Guest.Id), item.Id)); // flag = order_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_Order_Guest.Id), item.Id));
Console.WriteLine(string.Format("已完成 {0}/{1} ", index, list.Count)); // Console.WriteLine(string.Format("已完成 {0}/{1} ", index, list.Count));
index++; // index++;
} // }
} //}
return flag; return flag;
} }
} }
......
Edu.Module.Course/ScrollClassModule.cs
View file @ 8110ffef
...@@ -2863,22 +2863,24 @@ namespace Edu.Module.Course ...@@ -2863,22 +2863,24 @@ namespace Edu.Module.Course
if (gmodel != null && gmodel.CourseChapterNo < demodel.ChapterNo) if (gmodel != null && gmodel.CourseChapterNo < demodel.ChapterNo)
{ {
//ld 2022-03-08 修改为学员上课最大课时 //ld 2022-03-08 修改为学员上课最大课时
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() { Dictionary<string, object> keyValues1 = new Dictionary<string, object>()
{
{ nameof(RB_Order_Guest_ViewModel.CourseChapterNo), demodel.ChapterNo}, { nameof(RB_Order_Guest_ViewModel.CourseChapterNo), demodel.ChapterNo},
{ nameof(RB_Order_Guest_ViewModel.CompleteHours), demodel.ChapterNo * clist.Sum(x=>x.ClassHours)} { nameof(RB_Order_Guest_ViewModel.CompleteHours), demodel.ChapterNo * clist.Sum(x=>x.ClassHours)}
}; };
if (gmodel.TotalChapterNo <= demodel.ChapterNo) if (gmodel.TotalChapterNo <= demodel.ChapterNo)
{ {
//章节已上完了 修改为 毕业 //章节已上完了 修改为 毕业
keyValues1.Add(nameof(Model.ViewModel.Sell.RB_Order_Guest_ViewModel.GuestState), Common.Enum.Course.GuestStateEnum.Graduate); keyValues1.Add(nameof(Model.ViewModel.Sell.RB_Order_Guest_ViewModel.GuestState), Common.Enum.Course.GuestStateEnum.Graduate);
} }
List<WhereHelper> wheres1 = new List<WhereHelper>() { List<WhereHelper> wheres1 = new List<WhereHelper>()
{
new WhereHelper(){ new WhereHelper(){
FiledName = nameof(Model.ViewModel.Sell.RB_Order_Guest_ViewModel.Id), FiledName = nameof(Model.ViewModel.Sell.RB_Order_Guest_ViewModel.Id),
FiledValue = gmodel.Id, FiledValue = gmodel.Id,
OperatorEnum =OperatorEnum.Equal OperatorEnum =OperatorEnum.Equal
} }
}; };
order_GuestRepository.Update(keyValues1, wheres1); order_GuestRepository.Update(keyValues1, wheres1);
} }
if (demodel.AppointType != 3) if (demodel.AppointType != 3)
......
Edu.Module.Duty/VisitorReserveModule.cs
View file @ 8110ffef
...@@ -370,12 +370,20 @@ namespace Edu.Module.Duty ...@@ -370,12 +370,20 @@ namespace Edu.Module.Duty
} }
else else
{ {
var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("StudyAbroad_Leader"); var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("StudyAbroad_Leader");
var newId = visitor_ReserveRepository.Insert(model); var newId = visitor_ReserveRepository.Insert(model);
model.Id = newId; model.Id = newId;
flag = newId > 0; flag = newId > 0;
if (flag) if (flag)
{ {
Dictionary<string, object> filedss = new Dictionary<string, object>()
{
{nameof(RB_Student.UpdateBy),model.UpdateBy },
{nameof(RB_Student.UpdateTime),model.UpdateTime },
{nameof(RB_Student.StudentType),2 },
};
flag = studentRepository.Update(filedss, new WhereHelper(nameof(RB_Student.StuId), guestModel.StuId));
//发生企业微信推送信息 暂时未做后续完善 //发生企业微信推送信息 暂时未做后续完善
#region 试听课负责人（管理者） #region 试听课负责人（管理者）
......
Edu.Module.EduTask/OrderChangeModule.cs
View file @ 8110ffef
This diff is collapsed.
Edu.WebApi/Controllers/Applet/AppletCenterController.cs
View file @ 8110ffef
...@@ -122,7 +122,7 @@ namespace Edu.WebApi.Controllers.Applet ...@@ -122,7 +122,7 @@ namespace Edu.WebApi.Controllers.Applet
{ {
State = 1, State = 1,
TotalHours = guestModel?.TotalHours ?? 0, TotalHours = guestModel?.TotalHours ?? 0,
CompleteHours = CompleteHours, CompleteHours,
MakeUpHours = guestModel?.MakeUpHours ?? 0, MakeUpHours = guestModel?.MakeUpHours ?? 0,
AbsenceNum = guestModel?.AbsenceNum ?? 0, AbsenceNum = guestModel?.AbsenceNum ?? 0,
LeaveNum = guestModel?.LeaveNum ?? 0, LeaveNum = guestModel?.LeaveNum ?? 0,
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 8110ffef
...@@ -58,7 +58,9 @@ namespace Edu.WebApi.Controllers.Course ...@@ -58,7 +58,9 @@ namespace Edu.WebApi.Controllers.Course
CourseName = base.ParmJObj.GetStringValue("CourseName"), CourseName = base.ParmJObj.GetStringValue("CourseName"),
ClassNo = base.ParmJObj.GetStringValue("ClassNo"), ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
CourseSubject = base.ParmJObj.GetInt("CourseSubject"), CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
ClassScrollType = base.ParmJObj.GetInt("ClassScrollType", 1) ClassScrollType = base.ParmJObj.GetInt("ClassScrollType", 1),
StartTime = base.ParmJObj.GetStringValue("StartTime"),
EndTime = base.ParmJObj.GetStringValue("EndTime"),
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
List<object> result = new List<object>(); List<object> result = new List<object>();
...@@ -581,16 +583,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -581,16 +583,6 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.Success(data: data); return ApiResult.Success(data: data);
} }
/// <summary>
/// 初始化数据
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult InitData()
{
bool flag = classModule.InitDataModule();
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary> /// <summary>
/// 修改班级状态 /// 修改班级状态
...@@ -1244,27 +1236,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1244,27 +1236,6 @@ namespace Edu.WebApi.Controllers.Course
EndDate = list.FirstOrDefault().ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = list.FirstOrDefault().ClassDate.ToString("yyyy-MM-dd HH:mm:ss"),
ClassTimeId = list.FirstOrDefault().ClassTimeId, ClassTimeId = list.FirstOrDefault().ClassTimeId,
}); });
#region 验证是否存在学员编号
if (list.Count == 1)
{
if (list[0].OrderGuestId == 0)
{
var guestId = classModule.GetStudentOrderGuestIdByClassTimeIDModule(list[0].StuId, list[0].ClassTimeId);
if (guestId == 0)
{
return ApiResult.ParamIsNull(message: "当前课程不是你的上课内容，请联系前台");
}
else
{
list[0].OrderGuestId = guestId;
}
}
if (checkLogList.Where(x => x.OrderGuestId == list[0].OrderGuestId && x.CheckStatus == list[0].CheckStatus).Any())
{
return ApiResult.Success(message: "check_repeat");
}
}
#endregion
if (list == null || !list.Any()) if (list == null || !list.Any())
{ {
...@@ -1284,23 +1255,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1284,23 +1255,6 @@ namespace Edu.WebApi.Controllers.Course
} }
#endregion #endregion
//获取班级的学员信息
var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = groupId, ClassId = list.FirstOrDefault().ClassId, QEffectStatus = 1 });
//判断今天有课没有
var planList = classModule.GetClassPlanEntityModule(new RB_Class_Plan_ViewModel
{
Group_Id = groupId,
ClassId = list.FirstOrDefault().ClassId,
QClassDateStr = Common.ConvertHelper.FormatDate(list.FirstOrDefault().ClassDate),
});
if (planList == null || !planList.Any())
{
return ApiResult.Failed("今日无课程，无须签到");
}
foreach (var item in list) foreach (var item in list)
{ {
var signModel = checkLogList?.Where(qitem => qitem.ClassDate.ToString("yyyy-MM-dd") == item.ClassDate.ToString("yyyy-MM-dd") && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault(); var signModel = checkLogList?.Where(qitem => qitem.ClassDate.ToString("yyyy-MM-dd") == item.ClassDate.ToString("yyyy-MM-dd") && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
...@@ -1311,7 +1265,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1311,7 +1265,6 @@ namespace Edu.WebApi.Controllers.Course
item.CreateTime = signModel.CreateTime; item.CreateTime = signModel.CreateTime;
item.CreateBy = Uid; item.CreateBy = Uid;
item.Status = 0; item.Status = 0;
#region 验证缺席 补课是否已处理 #region 验证缺席 补课是否已处理
if (signModel.CheckStatus == 1 && item.CheckStatus != 1) if (signModel.CheckStatus == 1 && item.CheckStatus != 1)
{ {
......
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