diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index 06cf05a57..3359f0d1c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -193,14 +193,29 @@ namespace Learun.Application.WebApi.Modules var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd"); // 获取学年,学期 - var semesterAndYear = Common.GetSemesterAndYear(startDate); - var strAcademicYear = semesterAndYear.AcademicYearLong; - var strSemester = semesterAndYear.Semester; + var strAcademicYear = ""; + var strSemester = ""; + var AcademicYearShort = ""; + if (!string.IsNullOrEmpty(param.StartDate)) + { + var NewsemesterAndYear = Common.GetSemesterAndYear(param.StartDate); + strAcademicYear = NewsemesterAndYear.AcademicYearLong; + strSemester = NewsemesterAndYear.Semester; + AcademicYearShort = NewsemesterAndYear.AcademicYearShort; + } + else + { + var semesterAndYear = Common.GetSemesterAndYear(startDate); + strAcademicYear = semesterAndYear.AcademicYearLong; + strSemester = semesterAndYear.Semester; + AcademicYearShort = semesterAndYear.AcademicYearShort; + } + if (param.StartDate.IsEmpty() && param.EndDate.IsEmpty()) { // 校历 - var entity = schoolCalendarIbll.GetSchoolCalendarEntityByNo(semesterAndYear.AcademicYearShort, semesterAndYear.Semester); + var entity = schoolCalendarIbll.GetSchoolCalendarEntityByNo(AcademicYearShort, strSemester); var StartTime = entity.StartTime.Value; //获取第几周 var curWeek = WeekOfYear(startdate, entity.StartTime.Value, entity.EndTime.Value); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue index eb20952fb..064c92c49 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue @@ -1,65 +1,58 @@ - - {{ pageInfo.lessonDate }} 第{{ pageInfo.jc }}节 - + + {{ pageInfo.lessonDate }} 第{{ pageInfo.jc }}节 + - + - - + + {{ pageInfo.curriculum }} - - + + {{ pageInfo.teacher }} - {{ pageInfo.classRoomNo }} - 应到 {{ weekData.records }} - - - + + {{ pageInfo.classRoomNo }} + 应到 {{ weekData.records }} + + + - + - - 准时 - 早退 - 旷课 - 病假 - 迟到 - 事假 - + + 准时 + 早退 + 旷课 + 病假 + 迟到 + 事假 + - + 暂时没有信息 - + {{ k.StuName }} - + - - {{ weekData.rows[ind].StuName }} - 学号: {{ weekData.rows[ind].StuNo }} - - - {{ n.txt }} - + + {{ weekData.rows[ind].StuName }} + 学号: {{ weekData.rows[ind].StuNo }} + + + {{ n.txt }} + 确定 @@ -67,442 +60,443 @@