From 91494d38ce95c1656452f6f56d1e9a1b590c3fb8 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 15 Aug 2023 18:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF-=E5=AD=A6=E7=94=9F-=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AF=BE=E8=A1=A8=EF=BC=9A=E6=98=BE=E7=A4=BA=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84=E8=80=83=E5=8B=A4=E6=89=93=E5=8D=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 12 +++++++++++- .../ArrangeLessonTermOfElectiveService.cs | 8 +++++--- .../LearunApp-2.2.0/pages/timeTable/list.vue | 11 ++++++++--- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 1a8fc2b31..44fed0faf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -1217,11 +1217,13 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest if (userType == "学生") { sql = @"SELECT - b.LessonNo,b.AcademicYearNo as AcademicYear,b.LessonName,b.LessonTime,b.LessonDate,b.Empname EmpName,b.EmpNo,c.ClassroomName,b.Semester,b.ClassroomNo as ClassRoomNo,b.LessonSortNo,d.ClassName,e.EnName from StuSelectLessonList a + b.LessonNo,b.AcademicYearNo as AcademicYear,b.LessonName,b.LessonTime,b.LessonDate,b.Empname EmpName,b.EmpNo,c.ClassroomName,b.Semester,b.ClassroomNo as ClassRoomNo,b.LessonSortNo,d.ClassName,e.EnName,sa.AttendOrNo,sa.Sort + from StuSelectLessonList a left join ArrangeLessonTerm b on b.TeachClassNo=RTRIM(a.LessonName) + RTRIM(a.PartCode) + RTRIM(a.TeachClassNo) left join ClassroomInfo c on c.ClassroomNo=b.classroomNo left join ClassInfo d on replace(b.TeachClassNo,b.LessonName,'')=d.ClassNo left join LessonInfo e on a.LessonNo=e.LessonNo + left join StuAttendance sa on b.ALTId=sa.ALTId and sa.StuNo=@userAccount where a.StuNo=@userAccount and a.AcademicYearNo=@strAcademicYear and a.Semester=@strSemester and b.AcademicYearNo=@strAcademicYear and b.Semester=@strSemester and b.LessonDate>=@startDate and b.LessonDate<=@endDate and b.CheckMark=1"; @@ -2242,6 +2244,14 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les public string F_SchoolId { get; set; } public string DeptNo { get; set; } public string MajorNo { get; set; } + /// + /// 出勤否(填是、否） + /// + public string AttendOrNo { get; set; } + /// + /// 出勤情况分类：准时、迟到、 + /// + public string Sort { get; set; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs index 5e06af798..61eccad04 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs @@ -641,7 +641,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration // and a.AcademicYearNo=@strAcademicYear and a.Semester=@strSemester // and a.LessonDate >= @startDate and a.LessonDate <=@endDate // and a.CheckMark='1'"; - sql = @" select e.EnName,a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,e.LessonName,a.LessonSection as LessonTime,a.EmpNo,emp.EmpName,cr.ClassroomName,a.ClassRoomNo,a.LessonSortNo,ccc.olpoeid as OLPEId + sql = @" select e.EnName,a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,e.LessonName,a.LessonSection as LessonTime,a.EmpNo,emp.EmpName,cr.ClassroomName,a.ClassRoomNo,a.LessonSortNo,ccc.olpoeid as OLPEId,sa.AttendOrNo,sa.Sort from (select olpoeid from ElectiveMergeItem where emid in (select emid from ElectiveMergeItem aa left @@ -654,18 +654,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ArrangeLessonTermOfElective a on ccc.olpoeid = a.PaiKeId left join LessonInfo e on a.LessonNo=e.LessonNo left join EmpInfo emp on a.EmpNo=emp.EmpNo - left join ClassroomInfo cr on a.ClassRoomNo=cr.ClassroomNo + left join ClassroomInfo cr on a.ClassRoomNo=cr.ClassroomNo + left join StuAttendance sa on a.Id=sa.ALTOEId and sa.StuNo=@userAccount where a.AcademicYearNo = @strAcademicYear and a.Semester = @strSemester and a.LessonDate >= @startDate and a.LessonDate <=@endDate and a.CheckMark = '1' union - select e.EnName,a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,e.LessonName,a.LessonSection as LessonTime,a.EmpNo,emp.EmpName,cr.ClassroomName,a.ClassRoomNo,a.LessonSortNo,b.OLPEId + select e.EnName,a.LessonDate,a.AcademicYearNo as AcademicYear,a.Semester,a.LessonNo,e.LessonName,a.LessonSection as LessonTime,a.EmpNo,emp.EmpName,cr.ClassroomName,a.ClassRoomNo,a.LessonSortNo,b.OLPEId,sa.AttendOrNo,sa.Sort from StuSelectLessonListOfElective b left join ArrangeLessonTermOfElective a on b.OLPEId=a.PaiKeId left join LessonInfo e on a.LessonNo=e.LessonNo left join EmpInfo emp on a.EmpNo=emp.EmpNo left join ClassroomInfo cr on a.ClassRoomNo=cr.ClassroomNo + left join StuAttendance sa on a.Id=sa.ALTOEId and sa.StuNo=@userAccount where b.StuNo=@userAccount and b.Status=2 and b.AcademicYearNo=@strAcademicYear and b.Semester=@strSemester and a.AcademicYearNo=@strAcademicYear and a.Semester=@strSemester diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue index 62976e4d9..76a786556 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue @@ -47,8 +47,14 @@ - - {{ k.ClassroomName }} + + + {{ k.ClassroomName }} + + + {{ k.Sort }} + {{ k.Sort }} + @@ -402,7 +408,6 @@ export default { .tSec2Location { width: 30%; float: left; - line-height: 44px; font-size: 13px; color: #888888; }