@@ -142,40 +142,43 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
{ | { | ||||
if (entity.IsCheck == "1") | if (entity.IsCheck == "1") | ||||
{ | { | ||||
var gender = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(entity.StuNo)?.GenderNo; | |||||
StuAttendanceEntity stuAttendanceEntity = new StuAttendanceEntity(); | |||||
stuAttendanceEntity.AcademicYearNo = entity.AcademicYearNo; | |||||
stuAttendanceEntity.Semester = entity.Semester; | |||||
stuAttendanceEntity.StuNo = entity.StuNo; | |||||
stuAttendanceEntity.StuName = entity.StuName; | |||||
stuAttendanceEntity.Gender = Convert.ToBoolean(gender) ? "男" : "女"; | |||||
stuAttendanceEntity.Grade = entity.Grade; | |||||
stuAttendanceEntity.DeptNo = entity.DeptNo; | |||||
stuAttendanceEntity.DeptName = entity.DeptName; | |||||
stuAttendanceEntity.MajorNo = entity.MajorNo; | |||||
stuAttendanceEntity.MajorName = entity.MajorName; | |||||
stuAttendanceEntity.ClassNo = entity.ClassNo; | |||||
stuAttendanceEntity.ClassName = entity.ClassName; | |||||
stuAttendanceEntity.LessonNo = entity.LessonNo; | |||||
stuAttendanceEntity.LessonName = entity.LessonName; | |||||
stuAttendanceEntity.TeachClassNo = entity.TeachClassNo; | |||||
stuAttendanceEntity.LessonSortNo = entity.LessonSortNo; | |||||
stuAttendanceEntity.LessonSortName = entity.LessonSortName; | |||||
stuAttendanceEntity.LessonDate = entity.LessonDate; | |||||
stuAttendanceEntity.PlanWeek = null; | |||||
stuAttendanceEntity.LessonTime = entity.LessonTime; | |||||
stuAttendanceEntity.AttendOrNo = "否"; | |||||
stuAttendanceEntity.Sort = Convert.ToInt32(entity.LeaveType)==2?"病假":"事假"; | |||||
stuAttendanceEntity.EmpNo = entity.EmpNo; | |||||
stuAttendanceEntity.Remark = "属于PC端的学生课表请假审核"; | |||||
stuAttendanceEntity.CheckMarkDept = ""; | |||||
stuAttendanceEntity.CheckMark = ""; | |||||
stuAttendanceEntity.InertDate = DateTime.Now; | |||||
stuAttendanceEntity.ClassRoomNo = entity.ClassRoomNo; | |||||
stuAttendanceEntity.ClassRoomName = entity.ClassRoomName; | |||||
stuAttendanceIBLL.SaveEntity("", stuAttendanceEntity); | |||||
var model = stuAttendanceLeaveIBLL.GetStuAttendanceLeaveEntity(keyValue); | |||||
if (model != null) | |||||
{ | |||||
var gender = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(model.StuNo)?.GenderNo; | |||||
StuAttendanceEntity stuAttendanceEntity = new StuAttendanceEntity(); | |||||
stuAttendanceEntity.AcademicYearNo = model.AcademicYearNo; | |||||
stuAttendanceEntity.Semester = model.Semester; | |||||
stuAttendanceEntity.StuNo = model.StuNo; | |||||
stuAttendanceEntity.StuName = model.StuName; | |||||
stuAttendanceEntity.Gender = Convert.ToBoolean(gender) ? "男" : "女"; | |||||
stuAttendanceEntity.Grade = model.Grade; | |||||
stuAttendanceEntity.DeptNo = model.DeptNo; | |||||
stuAttendanceEntity.DeptName = model.DeptName; | |||||
stuAttendanceEntity.MajorNo = model.MajorNo; | |||||
stuAttendanceEntity.MajorName = model.MajorName; | |||||
stuAttendanceEntity.ClassNo = model.ClassNo; | |||||
stuAttendanceEntity.ClassName = model.ClassName; | |||||
stuAttendanceEntity.LessonNo = model.LessonNo; | |||||
stuAttendanceEntity.LessonName = model.LessonName; | |||||
stuAttendanceEntity.TeachClassNo = model.TeachClassNo; | |||||
stuAttendanceEntity.LessonSortNo = model.LessonSortNo; | |||||
stuAttendanceEntity.LessonSortName = model.LessonSortName; | |||||
stuAttendanceEntity.LessonDate = model.LessonDate; | |||||
stuAttendanceEntity.PlanWeek = null; | |||||
stuAttendanceEntity.LessonTime = model.LessonTime; | |||||
stuAttendanceEntity.AttendOrNo = "否"; | |||||
stuAttendanceEntity.Sort = Convert.ToInt32(model.LeaveType) == 2 ? "病假" : "事假"; | |||||
stuAttendanceEntity.EmpNo = model.EmpNo; | |||||
stuAttendanceEntity.Remark = "属于PC端的学生课表请假审核"; | |||||
stuAttendanceEntity.CheckMarkDept = ""; | |||||
stuAttendanceEntity.CheckMark = ""; | |||||
stuAttendanceEntity.InertDate = DateTime.Now; | |||||
stuAttendanceEntity.ClassRoomNo = model.ClassRoomNo; | |||||
stuAttendanceEntity.ClassRoomName = model.ClassRoomName; | |||||
stuAttendanceIBLL.SaveEntity("", stuAttendanceEntity); | |||||
} | |||||
} | } | ||||
} | } | ||||
return Success("保存成功!"); | return Success("保存成功!"); | ||||
@@ -139,39 +139,44 @@ namespace Learun.Application.WebApi | |||||
{ | { | ||||
if (entity.IsCheck == "1") | if (entity.IsCheck == "1") | ||||
{ | { | ||||
var gender = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(entity.StuNo)?.GenderNo; | |||||
StuAttendanceEntity stuAttendanceEntity = new StuAttendanceEntity(); | |||||
stuAttendanceEntity.AcademicYearNo = entity.AcademicYearNo; | |||||
stuAttendanceEntity.Semester = entity.Semester; | |||||
stuAttendanceEntity.StuNo = entity.StuNo; | |||||
stuAttendanceEntity.StuName = entity.StuName; | |||||
stuAttendanceEntity.Gender = Convert.ToBoolean(gender) ? "男" : "女"; | |||||
stuAttendanceEntity.Grade = entity.Grade; | |||||
stuAttendanceEntity.DeptNo = entity.DeptNo; | |||||
stuAttendanceEntity.DeptName = entity.DeptName; | |||||
stuAttendanceEntity.MajorNo = entity.MajorNo; | |||||
stuAttendanceEntity.MajorName = entity.MajorName; | |||||
stuAttendanceEntity.ClassNo = entity.ClassNo; | |||||
stuAttendanceEntity.ClassName = entity.ClassName; | |||||
stuAttendanceEntity.LessonNo = entity.LessonNo; | |||||
stuAttendanceEntity.LessonName = entity.LessonName; | |||||
stuAttendanceEntity.TeachClassNo = entity.TeachClassNo; | |||||
stuAttendanceEntity.LessonSortNo = entity.LessonSortNo; | |||||
stuAttendanceEntity.LessonSortName = entity.LessonSortName; | |||||
stuAttendanceEntity.LessonDate = entity.LessonDate; | |||||
stuAttendanceEntity.PlanWeek = null; | |||||
stuAttendanceEntity.LessonTime = entity.LessonTime; | |||||
stuAttendanceEntity.AttendOrNo = "否"; | |||||
stuAttendanceEntity.Sort = Convert.ToInt32(entity.LeaveType) == 2 ? "病假" : "事假"; | |||||
stuAttendanceEntity.EmpNo = entity.EmpNo; | |||||
stuAttendanceEntity.Remark = "属于移动端的学生课表请假审核"; | |||||
stuAttendanceEntity.CheckMark = ""; | |||||
stuAttendanceEntity.CheckMarkDept = ""; | |||||
stuAttendanceEntity.InertDate = DateTime.Now; | |||||
stuAttendanceEntity.ClassRoomNo = entity.ClassRoomNo; | |||||
stuAttendanceEntity.ClassRoomName = entity.ClassRoomName; | |||||
stuAttendanceIBLL.SaveEntity("", stuAttendanceEntity); | |||||
var model = stuAttendanceLeaveIBLL.GetStuAttendanceLeaveEntity(parameter.keyValue); | |||||
if (model != null) | |||||
{ | |||||
var gender = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(model.StuNo)?.GenderNo; | |||||
StuAttendanceEntity stuAttendanceEntity = new StuAttendanceEntity(); | |||||
stuAttendanceEntity.AcademicYearNo = model.AcademicYearNo; | |||||
stuAttendanceEntity.Semester = model.Semester; | |||||
stuAttendanceEntity.StuNo = model.StuNo; | |||||
stuAttendanceEntity.StuName = model.StuName; | |||||
stuAttendanceEntity.Gender = Convert.ToBoolean(gender) ? "男" : "女"; | |||||
stuAttendanceEntity.Grade = model.Grade; | |||||
stuAttendanceEntity.DeptNo = model.DeptNo; | |||||
stuAttendanceEntity.DeptName = model.DeptName; | |||||
stuAttendanceEntity.MajorNo = model.MajorNo; | |||||
stuAttendanceEntity.MajorName = model.MajorName; | |||||
stuAttendanceEntity.ClassNo = model.ClassNo; | |||||
stuAttendanceEntity.ClassName = model.ClassName; | |||||
stuAttendanceEntity.LessonNo = model.LessonNo; | |||||
stuAttendanceEntity.LessonName = model.LessonName; | |||||
stuAttendanceEntity.TeachClassNo = model.TeachClassNo; | |||||
stuAttendanceEntity.LessonSortNo = model.LessonSortNo; | |||||
stuAttendanceEntity.LessonSortName = model.LessonSortName; | |||||
stuAttendanceEntity.LessonDate = model.LessonDate; | |||||
stuAttendanceEntity.PlanWeek = null; | |||||
stuAttendanceEntity.LessonTime = model.LessonTime; | |||||
stuAttendanceEntity.AttendOrNo = "否"; | |||||
stuAttendanceEntity.Sort = Convert.ToInt32(model.LeaveType) == 2 ? "病假" : "事假"; | |||||
stuAttendanceEntity.EmpNo = model.EmpNo; | |||||
stuAttendanceEntity.Remark = "属于移动端的学生课表请假审核"; | |||||
stuAttendanceEntity.CheckMark = ""; | |||||
stuAttendanceEntity.CheckMarkDept = ""; | |||||
stuAttendanceEntity.InertDate = DateTime.Now; | |||||
stuAttendanceEntity.ClassRoomNo = model.ClassRoomNo; | |||||
stuAttendanceEntity.ClassRoomName = model.ClassRoomName; | |||||
stuAttendanceIBLL.SaveEntity("", stuAttendanceEntity); | |||||
} | |||||
} | } | ||||
} | } | ||||