Commit 1db10c5c authored by 黄奎's avatar 黄奎

页面修改

parent 1f264059
...@@ -1204,17 +1204,26 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1204,17 +1204,26 @@ namespace Edu.WebApi.Controllers.Course
}); });
} }
} }
int groupId = 100000;
int Uid = 1;
if (base.UserInfo != null)
{
groupId = base.UserInfo.Group_Id;
Uid = base.UserInfo.Id;
}
//判断当天是否有已签到数据 //判断当天是否有已签到数据
var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel
{ {
Group_Id = base.UserInfo.Group_Id, Group_Id = groupId,
ClassId = list.FirstOrDefault().ClassId, ClassId = list.FirstOrDefault().ClassId,
StartDate = list.FirstOrDefault().ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), StartDate = list.FirstOrDefault().ClassDate.ToString("yyyy-MM-dd HH:mm:ss"),
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 验证是否存在学员编号 #region 验证是否存在学员编号
if (list.Count == 1) { if (list.Count == 1)
{
if (list[0].OrderGuestId == 0) if (list[0].OrderGuestId == 0)
{ {
var guestId = classModule.GetStudentOrderGuestIdByClassTimeIDModule(list[0].StuId, list[0].ClassTimeId); var guestId = classModule.GetStudentOrderGuestIdByClassTimeIDModule(list[0].StuId, list[0].ClassTimeId);
...@@ -1245,7 +1254,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1245,7 +1254,7 @@ namespace Edu.WebApi.Controllers.Course
#region 验证是否已轧账 #region 验证是否已轧账
string MonthStr = list.FirstOrDefault().ClassDate.ToString("yyyy-MM"); string MonthStr = list.FirstOrDefault().ClassDate.ToString("yyyy-MM");
int schoolId = list.FirstOrDefault().School_Id; int schoolId = list.FirstOrDefault().School_Id;
string ValidateMsg = classModule.ValidateClassCheckFinance(MonthStr, schoolId, base.UserInfo.Group_Id); string ValidateMsg = classModule.ValidateClassCheckFinance(MonthStr, schoolId, groupId);
if (ValidateMsg != "") if (ValidateMsg != "")
{ {
return ApiResult.Failed(ValidateMsg); return ApiResult.Failed(ValidateMsg);
...@@ -1253,12 +1262,12 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1253,12 +1262,12 @@ namespace Edu.WebApi.Controllers.Course
#endregion #endregion
//获取班级的学员信息 //获取班级的学员信息
var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, QEffectStatus = 1 }); 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 var planList = classModule.GetClassPlanEntityModule(new RB_Class_Plan_ViewModel
{ {
Group_Id = base.UserInfo.Group_Id, Group_Id = groupId,
ClassId = list.FirstOrDefault().ClassId, ClassId = list.FirstOrDefault().ClassId,
QClassDateStr = Common.ConvertHelper.FormatDate(list.FirstOrDefault().ClassDate), QClassDateStr = Common.ConvertHelper.FormatDate(list.FirstOrDefault().ClassDate),
}); });
...@@ -1277,7 +1286,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1277,7 +1286,7 @@ namespace Edu.WebApi.Controllers.Course
item.ClassCheckId = signModel.ClassCheckId; item.ClassCheckId = signModel.ClassCheckId;
item.Group_Id = signModel.Group_Id; item.Group_Id = signModel.Group_Id;
item.CreateTime = signModel.CreateTime; item.CreateTime = signModel.CreateTime;
item.CreateBy = base.UserInfo.Id; item.CreateBy = Uid;
item.Status = 0; item.Status = 0;
#region 验证缺席 补课是否已处理 #region 验证缺席 补课是否已处理
...@@ -1297,9 +1306,9 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1297,9 +1306,9 @@ namespace Edu.WebApi.Controllers.Course
} }
else else
{ {
item.Group_Id = base.UserInfo.Group_Id; item.Group_Id = groupId;
item.CreateTime = System.DateTime.Now; item.CreateTime = System.DateTime.Now;
item.CreateBy = base.UserInfo.Id; item.CreateBy = Uid;
item.Status = 0; item.Status = 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