|
|
@@ -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<ArrangeLessonTermEntity>(strSql.ToString(),dp); |
|
|
|
return this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(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 && |
|
|
|