Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs

@@ -260,7 +260,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
                                              curriculum = string.IsNullOrEmpty(e.EnName) ? (e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName) : (e.LessonSortNo == "2" ? e.EnName + "[选修]" : e.EnName),
                                              lessonName = e.LessonName,
                                              teacher = e.EmpName,
-                                             classRoom = e.ClassroomName.Trim(),
+                                             classRoom = e.ClassroomName?.Trim(),
                                              academicyear = semesterAndYear.AcademicYearShort,
                                              semester = strSemester,
                                              lessonNo = e?.LessonNo,

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

@@ -307,7 +307,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="teachClassNo"></param>
         /// <returns></returns>
         public IEnumerable<StuSelectLessonListEntity> AttendanceStudents(Pagination pagination, string queryJson)
-        {
+         {
             try
             {
                 var queryParam = queryJson.ToJObject();
@@ -329,15 +329,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     ,a.[Grade]
                     ,a.[ConflictLessonNo]
                     ,a.[EmpNo]
-                    ,a.[TeachPlanNo],b.ID as StuAttendanceNo,b.AttendOrNo,b.Sort,b.AttenCondition,b.AttenScore 
+                    ,a.[TeachPlanNo],b.ID as StuAttendanceNo,b.AttendOrNo,b.Sort,b.AttenCondition,b.AttenScore,b.LessonDate 
                     ");
                 strSql.Append(" FROM StuSelectLessonList a left join StuAttendance b on a.AcademicYearNo=b.AcademicYearNo and a.StuNo=b.StuNo and a.Semester=b.Semester and a.EmpNo=b.EmpNo and a.LessonNo=b.LessonNo and a.TeachClassNo=b.TeachClassNo ");
                 strSql.Append($" and b.LessonTime='{queryParam["lessonTime"]}'");
+                strSql.Append($" and b.LessonDate='{queryParam["lessonDate"]}'");
                 strSql.Append(" WHERE 1=1 ");
                 strSql.Append($"and a.AcademicYearNo='{ queryParam["year"]}' and a.Semester='{queryParam["semester"]}' and a.EmpNo='{queryParam["empno"]}' and a.LessonNo='{queryParam["lessonNo"]}' and a.TeachClassNo='{queryParam["teachClassNo"]}' ");
                 return this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>(strSql.ToString(), pagination);
-
-
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs

@@ -791,6 +791,7 @@ union
                     ,a.[EmpNo],a.Id as StuSelectLessonListOfElectiveId,b.ID as StuAttendanceNo,b.AttendOrNo,b.Sort,b.AttenCondition,b.AttenScore 
                     ");
                 strSql.Append(" FROM StuSelectLessonListOfElective a left join StuAttendance b on a.AcademicYearNo=b.AcademicYearNo and a.StuNo=b.StuNo and a.Semester=b.Semester and a.EmpNo=b.EmpNo and a.LessonNo=b.LessonNo and a.ClassRoomNo=b.ClassRoomNo and a.LessonSection=b.LessonTime ");
+                strSql.Append($" and b.LessonDate='{queryParam["lessonDate"]}'");
                 strSql.Append(" WHERE 1=1 ");
                 strSql.Append($"and a.AcademicYearNo='{ queryParam["year"]}' and a.Semester='{queryParam["semester"]}' and a.Status=2 and a.EmpNo='{queryParam["empno"]}' and a.LessonNo='{queryParam["lessonNo"]}' and a.ClassRoomNo='{queryParam["classRoomNo"]}' and a.LessonSection like '%{queryParam["lessonTime"]}%'");