From 97534889eca1c429f4fcfc07e9ae040bae39c27f Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 23 Jun 2022 11:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=93=E4=B8=9A=E5=BC=80?= =?UTF-8?q?=E8=AF=BE=E8=AE=A1=E5=88=92=E6=B7=BB=E8=80=83=E8=AF=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 d58701a62..83bdd6a2d 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 @@ -110,7 +110,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["TeachClassNo"].IsEmpty()) { - dp.Add("TeachClassNo", "%"+queryParam["TeachClassNo"].ToString(), DbType.String); + dp.Add("TeachClassNo", "%" + queryParam["TeachClassNo"].ToString(), DbType.String); strSql.Append(" AND t.TeachClassNo like @TeachClassNo "); } if (!queryParam["EmpNo"].IsEmpty()) @@ -124,7 +124,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append(" AND t.ClassroomNo = @ClassroomNo "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); } catch (Exception ex) { @@ -871,7 +871,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest @"select m.name AS 'MajorName', m.number AS 'MajorNo', tt.EmpNo AS 'EmpNo', tt.EmpName AS 'EmpName', sc.name AS 'F_SchoolName', sc.sid AS 'F_SchoolId', p.grade AS 'Grade', p.classhour AS 'classhour', curr.name AS 'LessonName', curr.number AS 'LessonNo', - s.year AS 'AcademicYearNo', s.number AS 'Semester' FROM tb_major_plan p + s.year AS 'AcademicYearNo', s.number AS 'Semester' ,cour.`assessmentmethod` AS 'ExamType' FROM tb_major_plan p LEFT JOIN ( SELECT t.teacher, @@ -933,7 +933,8 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest CheckMark = "1", TestMark = 0, F_SchoolId = item.F_SchoolId, - State = 1 + State = 1, + ExamType = item.ExamType }; if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester &&