Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs

@@ -253,10 +253,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="AcademicYearNo"></param>
         /// <param name="Semester"></param>
         /// <returns></returns>
-        public int Import(string AcademicYearNo, string Semester,string ExamTime)
+        public int Import(string AcademicYearNo, string Semester, string ExamTime)
         {
             try
             {
+                //导入专业开课计划中是必修的（lessonsortno=1）、考核方式是考试的（ExamType='1'，2022.6.23新增）
                 string sql = $@"insert into Exam_ExamLesson([ELId]
            ,[AcademicYearNo]
            ,[Semester]
@@ -265,7 +266,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
            ,[LessonNo]
            ,[ELOrder]
            ,[ELEnabled],ExamTime)
-select NEWID(),AcademicYearNo,Semester,Grade,LessonName,[LessonNo],0,1,'{ExamTime}' from OpenLessonPlan where  lessonsortno=1 and AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}'
+select NEWID(),AcademicYearNo,Semester,Grade,LessonName,[LessonNo],0,1,'{ExamTime}' from OpenLessonPlan where ExamType='1' and lessonsortno=1 and AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}'
  and [LessonNo] not in (select [LessonNo] from Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' )
  group by LessonNo,LessonName,AcademicYearNo,Semester,Grade
 ";