From 41f13eb8a4653be23c9040b36e2be63c0b3bfb34 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 5 May 2022 10:03:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=93=E4=B8=9A=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BF=9D=E5=AD=98=E4=B8=BA=E5=BF=85=E4=BF=AE?= =?UTF-8?q?=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Controllers/ClassPlanController.cs | 1 + 1 file changed, 1 insertion(+) 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 cdb33e70f..b1bbcec28 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 @@ -117,6 +117,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers entity.AmendDate = DateTime.Now; } entity.State = 0; + entity.LessonSortNo = "1"; entity.IsAllowEdit = true; entity.MakeDate = DateTime.Now; var model = classPlanIBLL.GetRepetitions(entity.F_SchoolId, entity.AcademicYearNo, entity.Semester, entity.DeptNo, entity.MajorNo, entity.Grade, entity.LessonNo); From 96b233be4c0499352188d4046f03bebc69dc4ed8 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 5 May 2022 10:20:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=B9=B4?= =?UTF-8?q?=E5=AD=A6=E6=9C=9F=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Exam_ExamStudent/Exam_ExamStudentService.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs index e101fdba3..92370ceb7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs @@ -84,7 +84,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - + public IEnumerable GetPageListForExam(Pagination pagination, string queryJson) { try @@ -348,7 +348,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var historyStu = this.BaseRepository("CollegeMIS").FindList(); - + int XQ = Convert.ToInt32(Semester); List AddLStuist = new List(); if (ESType == "1") { @@ -361,13 +361,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ESId = Guid.NewGuid().ToString(), ClassNo = item.ClassNo, AcademicYearNo = AcademicYearNo, - Semester = Convert.ToInt32(Semester), + Semester = XQ, StuNo = item.StuNo, StuName = item.StuName, ESType = "1", ESEnabled = true }; - if (historyStu.Count(x => x.StuNo == stuList.StuNo && x.StuName == stuList.StuName && x.ESType == "1") == AddLStuist.Count(s => s.StuNo == stuList.StuNo && s.StuName == stuList.StuName && s.ESType == "1")) + if (historyStu.Count(x => x.StuNo == stuList.StuNo && x.StuName == stuList.StuName && x.AcademicYearNo == AcademicYearNo && x.Semester == XQ && x.ESType == "1") == AddLStuist.Count(s => s.StuNo == stuList.StuNo && s.StuName == stuList.StuName && s.AcademicYearNo == AcademicYearNo && s.Semester == XQ && s.ESType == "1")) { AddLStuist.Add(stuList); } @@ -384,13 +384,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ESId = Guid.NewGuid().ToString(), ClassNo = item.ClassNo, AcademicYearNo = AcademicYearNo, - Semester = Convert.ToInt32(Semester), + Semester = XQ, StuNo = item.StuNo, StuName = item.StuName, ESType = "2", ESEnabled = true }; - if (historyStu.Count(x => x.StuNo == stuList.StuNo && x.StuName == stuList.StuName && x.ESType == "2") == AddLStuist.Count(s => s.StuNo == stuList.StuNo && s.StuName == stuList.StuName && s.ESType == "2")) + if (historyStu.Count(x => x.StuNo == stuList.StuNo && x.StuName == stuList.StuName && x.AcademicYearNo == AcademicYearNo && x.Semester == XQ && x.ESType == "2") == AddLStuist.Count(s => s.StuNo == stuList.StuNo && s.StuName == stuList.StuName && s.AcademicYearNo == AcademicYearNo && s.Semester == XQ && s.ESType == "2")) { AddLStuist.Add(stuList); } @@ -407,13 +407,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ESId = Guid.NewGuid().ToString(), ClassNo = item.ClassNo, AcademicYearNo = AcademicYearNo, - Semester = Convert.ToInt32(Semester), + Semester = XQ, StuNo = item.StuNo, StuName = item.StuName, ESType = "3", ESEnabled = true }; - if (historyStu.Count(x => x.StuNo == stuList.StuNo && x.StuName == stuList.StuName && x.ESType == "3") == AddLStuist.Count(s => s.StuNo == stuList.StuNo && s.StuName == stuList.StuName && s.ESType == "3")) + if (historyStu.Count(x => x.StuNo == stuList.StuNo && x.StuName == stuList.StuName && x.AcademicYearNo == AcademicYearNo && x.Semester == XQ && x.ESType == "3") == AddLStuist.Count(s => s.StuNo == stuList.StuNo && s.StuName == stuList.StuName && s.AcademicYearNo == AcademicYearNo && s.Semester == XQ && s.ESType == "3")) { AddLStuist.Add(stuList); }