【修改】班级开课计划对接接口优化；

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -1068,28 +1068,33 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 else
                 {
                     //TeachClass数据处理 20211214改为直接读取mysql库
-                    var teachclasslist = BaseRepository("paikeDbString").FindList<TeachClassEntity>(@"SELECT   clazz.name AS 'clazzname',
-                                                                        clazz.number AS 'TeachClassNo',
-                                                                        curriculum.name AS 'curriculumname',
-                                                                        curriculum.number AS 'LessonNo',
-                                                                        semester.year AS 'AcademicYearNo',
-                                                                        semester.number AS 'Semester',
-                                                                        a.jointclass AS 'jointclass',
-                                                                        a.type AS 'LessonSortNo',
-                                                                        a.classhour AS 'classhour',
-                                                                        room.name AS 'roomname',
-                                                                        room.number AS 'roomnumber',
-                                                                        teacher.name AS 'teachername',
-                                                                        teacher.number AS 'EmpNo'
-                                                                        FROM tb_class_plan a
-                                                                            LEFT JOIN tb_clazz  clazz ON clazz.id = a.clazzid
-                                                                        LEFT JOIN tb_semester semester ON semester.id = clazz.semester
-                                                                        LEFT JOIN tb_curriculum  curriculum ON curriculum.id = a.curriculum
-                                                                        LEFT JOIN tb_classroom  room ON room.id = a.classroom
-                                                                        LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher
-                                                                        WHERE  semester.year = '" + entity.AcademicYearNo
-                                                                                                   + "' AND  semester.number = '"
-                                                                                                   + entity.Semester + "' and a.type='1' and teacher.number is not null ");
+                    var teachclasslist = BaseRepository("paikeDbString").FindList<TeachClassEntity>($@"SELECT
+	clazz.name AS 'clazzname',
+	clazz.number AS 'TeachClassNo',
+	curriculum.name AS 'curriculumname',
+	curriculum.number AS 'LessonNo',
+	semester.year AS 'AcademicYearNo',
+	semester.number AS 'Semester',
+	a.jointclass AS 'jointclass',
+	a.type AS 'LessonSortNo',
+	a.classhour AS 'classhour',
+	room.name AS 'roomname',
+	room.number AS 'roomnumber',
+	GROUP_CONCAT(teacher.name) AS 'teachername',
+	GROUP_CONCAT(teacher.number) AS 'EmpNo' 
+FROM
+	tb_class_plan a
+	LEFT JOIN tb_clazz clazz ON clazz.id = a.clazzid
+	LEFT JOIN tb_semester semester ON semester.id = clazz.semester
+	LEFT JOIN tb_curriculum curriculum ON curriculum.id = a.curriculum
+	LEFT JOIN tb_classroom room ON room.id = a.classroom
+	LEFT JOIN tb_teacher teacher ON FIND_IN_SET(teacher.id,a.teacher) 
+WHERE
+	semester.`year` = '{entity.AcademicYearNo}' 
+	AND semester.number = '{entity.Semester}' 
+	AND a.type = '1' 
+	AND teacher.number IS NOT NULL
+group by a.clazzid,a.curriculum ");
                     var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync<TeachClassEntity>(@"SELECT   *
                             FROM      TeachClass
                             WHERE   (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "'  ")).ToList();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanEntity.cs

@@ -104,7 +104,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 周课时
         /// </summary>
         [Column("WEEKLESSONHOUR")]
-        public int? WeekLessonHour { get; set; }
+        public decimal? WeekLessonHour { get; set; }
         /// <summary>
         /// 教室课时（周）
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs

@@ -121,7 +121,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped]
         public string LessonSortDetailNo { get; set; }
         [NotMapped]
-        public int? ClassHour { get; set; }
+        public decimal? ClassHour { get; set; }
 
         #endregion