diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs index 01c73d550..581e10704 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs @@ -21,6 +21,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private ClassPlanIBLL classPlanIBLL = new ClassPlanBLL(); private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); private TeachClassIBLL teachClassIBLL = new TeachClassBLL(); + private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); + private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL(); + private StuSelectLessonListIBLL stuSelectLessonListBLL = new StuSelectLessonListBLL(); #region 视图功能 @@ -175,8 +178,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult CourseArranging(string keyValue) { var entity = classPlanIBLL.GetListById(keyValue); + var stuinfobasicData = stuInfoBasicIBLL.GetAllList(); + var lessonData = lessonInfoIBLL.GetAllLesson(); List TeachList = new List(); + List StuSelectLessonList = new List(); + for (int i = 0; i < entity.Count; i++) { var lessonList = classInfoIBLL.GetAllClass(). @@ -198,6 +205,44 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers TeachEntity.LessonSortNo = entity[i].LessonSortNo; TeachEntity.F_SchoolId = entity[i].F_SchoolId; TeachList.Add(TeachEntity); + + var classstulist = stuinfobasicData.Where(m => m.ClassNo == TeachEntity.TeachClassNo) + .ToList(); + foreach (var stu in classstulist) + { + var insertDatastuselect = new StuSelectLessonListEntity(); + insertDatastuselect.NoticeBookNo = stu.NoticeNo; + insertDatastuselect.StuNo = stu.StuNo; + insertDatastuselect.DeptNo = stu.DeptNo; + insertDatastuselect.ClassNo = stu.ClassNo; + insertDatastuselect.MajorNo = stu.MajorNo; + insertDatastuselect.StuName = stu.StuName; + insertDatastuselect.GenderNo = stu.GenderNo != null && stu.GenderNo.Value ? "1" : "0"; + insertDatastuselect.AcademicYearNo = TeachEntity.AcademicYearNo; + insertDatastuselect.Semester = TeachEntity.Semester; + insertDatastuselect.OpenLessonDeptNo = TeachEntity.DeptNo; + insertDatastuselect.OpenLessonMajorNo = TeachEntity.MajorNo; + insertDatastuselect.LessonNo = TeachEntity.LessonNo; + insertDatastuselect.LessonName = lessonData.FirstOrDefault(m => m.LessonNo == TeachEntity.LessonNo)?.LessonName; + insertDatastuselect.PartCode = ""; + insertDatastuselect.OrdinaryScoreScale = 1; + insertDatastuselect.TermInScoreScale = 1; + insertDatastuselect.TermEndScoreScale = 1; + insertDatastuselect.OtherScoreScale = 1; + insertDatastuselect.TeachClassNo = stu.ClassNo; + insertDatastuselect.LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == TeachEntity.LessonNo)?.LessonSortNo; + insertDatastuselect.StuSortNo = "02"; + insertDatastuselect.Grade = stu.Grade; + insertDatastuselect.StudyScore = 0; + insertDatastuselect.TotalStudyHour = 0; + insertDatastuselect.IsInEffect = "1"; + insertDatastuselect.EmpNo = TeachEntity.EmpNo; + insertDatastuselect.IsPitchOn = "1"; + insertDatastuselect.CheckMark = "1"; + insertDatastuselect.InsertTime = DateTime.Now; + insertDatastuselect.F_SchoolId = TeachEntity.F_SchoolId; + StuSelectLessonList.Add(insertDatastuselect); + } } } else @@ -206,6 +251,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } } teachClassIBLL.SaveEntityList(TeachList); + stuSelectLessonListBLL.SaveEntityList(StuSelectLessonList); classPlanIBLL.SaveEntityList(keyValue, entity); return Success("排课成功"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonList/StuSelectLessonListService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonList/StuSelectLessonListService.cs index c3dfede79..e45e7762f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonList/StuSelectLessonListService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonList/StuSelectLessonListService.cs @@ -201,7 +201,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration stuLessonList.CheckMark = item.CheckMark; stuLessonList.InsertTime = item.InsertTime; stuLessonList.CheckMark = "1"; - db.Insert(stuLessonList); + + if (db.FindEntity(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.DeptNo == item.DeptNo && x.StuNo == item.StuNo && x.EmpNo == item.EmpNo + && x.MajorNo == item.MajorNo && x.Grade == item.Grade && x.LessonNo == item.LessonNo && x.F_SchoolId == item.F_SchoolId) == null) + { + db.Insert(stuLessonList); + } } db.Commit(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs index ea4845908..f0ffb5769 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs @@ -305,12 +305,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration Teach.DeptNo = item.DeptNo; Teach.MajorNo = item.MajorNo; Teach.Grade = item.Grade; + Teach.EmpNo = item.EmpNo; Teach.Semester = item.Semester; Teach.LessonNo = item.LessonNo; Teach.StuNum = item.StuNum; Teach.LessonSortNo = item.LessonSortNo; Teach.F_SchoolId = item.F_SchoolId; - db.Insert(Teach); + + if (db.FindEntity(x => x.AcademicYearNo == Teach.AcademicYearNo && x.Semester == Teach.Semester && x.DeptNo == Teach.DeptNo && x.EmpNo == Teach.EmpNo + && x.MajorNo == Teach.MajorNo && x.Grade == Teach.Grade && x.LessonNo == Teach.LessonNo && x.F_SchoolId == Teach.F_SchoolId) == null) + { + db.Insert(Teach); + } } db.Commit(); }