From 2dc33df86794c0ce21a7585916ea87048dd25e97 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 23 Jun 2022 11:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AF=BE=E7=A8=8B=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E5=BC=80=E8=AF=BE=E8=AE=A1=E5=88=92=20=E8=80=83?=
=?UTF-8?q?=E6=A0=B8=E6=96=B9=E5=BC=8F=E4=B8=BA=E8=80=83=E8=AF=95=E7=9A=84?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Exam_ExamLesson/Exam_ExamLessonService.cs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs
index 854298ff6..baf720dae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs
+++ b/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
///
///
///
- 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
";