【修改】课时费统计：实际月课时量的计算；

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

@@ -1870,7 +1870,7 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                     });
                 aa.AddRange(teacherDataModel);
                 //选修课
-                var teacherData2 = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermOfElectiveEntity>(x => yearList.Contains(x.AcademicYearNo));
+                var teacherData2 = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermOfElectiveEntity>(x => yearList.Contains(x.AcademicYearNo) && x.EmpName != null && x.EmpName.Length > 0);
                 if (!string.IsNullOrEmpty(schoolId))
                 {
                     teacherData2 = teacherData2.Where(x => x.F_SchoolId == schoolId);
@@ -2286,7 +2286,7 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                 {
                     strSql.Append("(select count(*) as courses,a.empno,a.empname  from ArrangeLessonTerm a where DeptNo='" + deptNo + "' and lessondate between '" + starttime + "' and '" + endtime + "' group by a.empno,a.empname ) a  ");
                 }
-                strSql.Append("left join (select count(*) as actcourses,empno from (select empno,ALTId from Teach_attendance where LessonSortNo='1' and clocktime between '" + starttime + "' and '" + endtime + "' group by empno,ALTId) as bb group by empno) ta on ta.empno=a.empno ");
+                strSql.Append("left join (select count(*) as actcourses,EmpNo from (select ff.EmpNo,ff.LessonDate,ff.LessonTime from (select aall.* from (select EmpNo,ALTId from Teach_attendance where LessonSortNo='1' and clocktime between '" + starttime + "' and '" + endtime + "' group by EmpNo,ALTId) ee left join ArrangeLessonTerm aall on aall.ALTId=ee.ALTId) ff group by ff.EmpNo,ff.LessonDate,ff.LessonTime) gg group by gg.EmpNo ) ta on ta.empno=a.empno ");
                 strSql.Append("left join empinfo b on a.empno=b.empno ");
                 strSql.Append("where a.empno is not null ");
                 return this.BaseRepository("CollegeMIS").FindList<LessonStatictisEntity>(strSql.ToString(), pagination);
@@ -2577,7 +2577,7 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                             {
                                 throw (new Exception("结束日期不能为空"));
                             }
-                            
+
                             if (dr["班级编号"].ToString().IsEmpty())
                             {
                                 throw (new Exception("班级编号不能为空"));