【修改】移动端-学生-我的课表：显示签到表中的考勤打卡信息；

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; }
+        /// <summary>
+        /// 出勤否(填是、否）
+        /// </summary>
+        public string AttendOrNo { get; set; }
+        /// <summary>
+        /// 出勤情况分类：准时、迟到、
+        /// </summary>
+        public string Sort { get; set; }
 
     }
 

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

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue

@@ -47,8 +47,14 @@
 										</view>
 									</view>
 									<view class="tSec2Location">
-										<text class="text-xxl cuIcon cuIcon-location"></text>
-										{{ k.ClassroomName }}
+										<view class="tSec2ListTxt">
+											<text class="text-xxl cuIcon cuIcon-location"></text>
+											{{ k.ClassroomName }}
+										</view>
+										<view class="tSec2ListTxt">
+											<view v-if="k.Sort == '准时' " class="text-blue">{{ k.Sort }}</view>
+											<view v-if="k.Sort == '迟到' " class="text-green">{{ k.Sort }}</view>
+										</view>
 									</view>
 								</view>
 							</view>
@@ -402,7 +408,6 @@ export default {
 .tSec2Location {
 	width: 30%;
 	float: left;
-	line-height: 44px;
 	font-size: 13px;
 	color: #888888;
 }