Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs

@@ -371,7 +371,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append(@"select b.classroomname,b.classroombuildingname,usecount,usecount as rate from ");
                 //教室使用频率去掉班级查询条件
                 //strSql.Append(@"(select teachclassno,classroomno,count(1) as usecount from ArrangeLessonTerm t where 1=1 ");
-                strSql.Append(@"(select classroomno,count(1) as usecount from ArrangeLessonTerm t where 1=1 ");
+                strSql.Append(@"(select classroomno,count(1) as usecount from ( ");
+                strSql.Append(@"select classroomno,count(1) as usecount from ArrangeLessonTerm t where CheckMark=1 ");
                 if (!queryParam["StartTime"].IsEmpty())
                 {
                     strSql.Append(" and t.LessonDate >= '" + queryParam["StartTime"] + "' ");
@@ -382,6 +383,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 //教室使用频率去掉班级查询条件
                 //strSql.Append(@" group by teachclassno,classroomno) a ");
+                strSql.Append(@" group by classroomno,LessonTime,LessonDate) x ");
                 strSql.Append(@" group by classroomno) a ");
                 strSql.Append(@"left join ");
                 strSql.Append(@"(select r.classroomno,r.classroomname,b.classroombuildingno,b.classroombuildingname from CLASSROOMINFO r ");