diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/ArrangeLessonTermImport.xls b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/ArrangeLessonTermImport.xls index 9f42d8866..0aaad87a5 100644 Binary files a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/ArrangeLessonTermImport.xls and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/excel/ArrangeLessonTermImport.xls differ diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index aba9f466e..385c68244 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -2353,17 +2353,29 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les { throw (new Exception("上课节次不能为空")); } - if (dr["是否必修课"].ToString().IsEmpty()) + #endregion + + #region 开始时间、结束时间格式判断 + var st = new TimeSpan(); + var stFlag = TimeSpan.TryParse(dr["开始时间"].ToString(), out st); + if (!stFlag) + { + throw (new Exception("开始时间格式有误")); + } + var et = new TimeSpan(); + var etFlag = TimeSpan.TryParse(dr["结束时间"].ToString(), out et); + if (!etFlag) { - throw (new Exception("是否必修课不能为空")); + throw (new Exception("结束时间格式有误")); } + #endregion //基础数据 - var lessonEntity = db.FindList($"select * from Lessoninfo where LessonName='" + dr["课程名称"].ToString().Trim() + "' and LessonNo='" + dr["课程编号"].ToString().Trim() + "'"); - var classEntity = db.FindList($"select * from ClassInfo where ClassName='" + dr["班级名称"].ToString().Trim() + "' and ClassNo='" + dr["班级编号"].ToString().Trim() + "'"); - var classroomEntity = db.FindList($"select * from ClassroomInfo where ClassroomName='" + dr["教室名称"].ToString().Trim() + "' and ClassroomNo='" + dr["教室编号"].ToString().Trim() + "'"); - var empinfoEntity = db.FindList($"select * from EmpInfo where EmpName='" + dr["教师名称"].ToString().Trim() + "' and EmpNo='" + dr["教师编号"].ToString().Trim() + "'"); + var lessonEntity = db.FindList($"select * from Lessoninfo where LessonName='" + dr["课程名称"].ToString().Trim() + "' and LessonNo='" + dr["课程编号"].ToString().Trim() + "' and CheckMark=1 "); + var classEntity = db.FindList($"select * from ClassInfo where ClassName='" + dr["班级名称"].ToString().Trim() + "' and ClassNo='" + dr["班级编号"].ToString().Trim() + "' and CheckMark=1 "); + var classroomEntity = db.FindList($"select * from ClassroomInfo where ClassroomName='" + dr["教室名称"].ToString().Trim() + "' and ClassroomNo='" + dr["教室编号"].ToString().Trim() + "' and CheckMark=1 "); + var empinfoEntity = db.FindList($"select * from EmpInfo where EmpName='" + dr["教师名称"].ToString().Trim() + "' and EmpNo='" + dr["教师编号"].ToString().Trim() + "' and CheckMark=1 "); var CompanyEntity = BaseRepository().FindList(x => x.F_EnabledMark == 1).ToList().FirstOrDefault(); if (lessonEntity.Count() <= 0) throw (new Exception("查无此课程")); @@ -2379,8 +2391,8 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les { ALTId = Guid.NewGuid().ToString(), LessonDate = dr["上课日期"].ToString().ToDate(), - StartTime = dr["开始时间"].ToString(), - EndTime = dr["结束时间"].ToString(), + StartTime = st.ToString(@"hh\:mm"), + EndTime = et.ToString(@"hh\:mm"), AcademicYearNo = dr["学年"].ToString(), Semester = dr["学期"].ToString(), DeptNo = classEntity.FirstOrDefault().DeptNo, @@ -2392,7 +2404,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les EmpName = empinfoEntity.FirstOrDefault().EmpName, ClassroomNo = classroomEntity.FirstOrDefault().ClassroomNo, LessonTime = dr["上课节次"].ToString(), - LessonSortNo = dr["是否必修课"].ToString() == "是" ? "1" : "2", + LessonSortNo = lessonEntity.FirstOrDefault().LessonSortNo, //默认数; CheckMark = "1", InsertDate = Insertdate, @@ -2535,9 +2547,21 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les var openLessonPlanData = BaseRepository("CollegeMIS").FindList(); var Teachdatetime = DateTime.Now; var insertDataList = new List(); - var majorData = BaseRepository("CollegeMIS").FindList().ToList(); var lessonData = BaseRepository("CollegeMIS").FindList().ToList(); - foreach (var item in teachclasslist) + var openlessonplanlist = teachclasslist.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.MajorNo, x.Grade, x.LessonNo, x.LessonName, x.LessonSortNo }) + .Select(x => new OpenLessonPlanEntity() + { + AcademicYearNo = x.Key.AcademicYearNo, + Semester = x.Key.Semester, + DeptNo = x.Key.DeptNo, + MajorNo = x.Key.MajorNo, + Grade = x.Key.Grade, + LessonNo = x.Key.LessonNo, + LessonName = x.Key.LessonName, + LessonSortNo = x.Key.LessonSortNo, + F_SchoolId = x.FirstOrDefault().F_SchoolId + }); + foreach (var item in openlessonplanlist) { var insertData = new OpenLessonPlanEntity() @@ -2546,21 +2570,20 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les MakeDate = Teachdatetime, AcademicYearNo = item.AcademicYearNo, Semester = item.Semester, - DeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo, + DeptNo = item.DeptNo, MajorNo = item.MajorNo, LessonNo = item.LessonNo, LessonName = item.LessonName, PartCode = "", Grade = item.Grade, - LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.LessonNo) - ?.LessonSortNo, + LessonSortNo = item.LessonSortNo, LessonSortDetailNo = lessonData .FirstOrDefault(m => m.LessonNo == item.LessonSortDetailNo)?.LessonSortDetailNo, StartWeek = item.StartWeek, EndWeek = item.EndWeek, CheckStyleNo = "1", ScoreRecordStyleNo = "1", - TeachDeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo, + TeachDeptNo = item.DeptNo, StudyScore = 0, AmendDate = Teachdatetime, ClassroomType = 1, @@ -2575,11 +2598,13 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo && m.Grade == insertData.Grade && m.LessonSortNo == insertData.LessonSortNo && - m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0 && + m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId && + m.DeptNo == insertData.DeptNo) == 0 && insertDataList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo && m.Grade == insertData.Grade && m.LessonSortNo == insertData.LessonSortNo && - m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0) + m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId && + m.DeptNo == insertData.DeptNo) == 0) { insertDataList.Add(insertData); }