Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

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);

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<Exam_ExamStudentEntity> GetPageListForExam(Pagination pagination, string queryJson)
         {
             try
@@ -348,7 +348,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var historyStu = this.BaseRepository("CollegeMIS").FindList<Exam_ExamStudentEntity>();
-
+                int XQ = Convert.ToInt32(Semester);
                 List<Exam_ExamStudentEntity> AddLStuist = new List<Exam_ExamStudentEntity>();
                 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);
                         }