【修改】PC端-学子在线-学生按天请假：请假流程审核通过方法的完善；

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

@@ -171,6 +171,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped] public string StuName { get; set; }
         [NotMapped] public string Grade { get; set; }
         [NotMapped] public string GenderNo { get; set; }
+        [NotMapped] public string ClassNo { get; set; }
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs

@@ -476,8 +476,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var endTime = Convert.ToDateTime(model.EndTime?.ToString("yyyy-MM-dd") + " 23:59:59");
 
                     //排课数据
-                    var arrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>($@"select a.*,b.StuName,b.Grade,b.GenderNo from [dbo].[ArrangeLessonTerm] a
-join stuinfobasic b on a.teachclassno=b.classno
+                    var arrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>($@"select a.*,b.StuName,b.Grade,b.GenderNo,b.ClassNo from [dbo].[ArrangeLessonTerm] a
+join stuinfobasic b on replace(a.TeachClassNo,a.LessonName,'')=b.classno
 where b.stuno='{model.CreateUserNo}'
 and a.lessondate between '{startTime}' and '{endTime}'");
 
@@ -488,6 +488,7 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                     var lessonSortList = this.BaseRepository("CollegeMIS").FindList<CdLessonSortEntity>().ToList();
                     foreach (var arrangeLessonTerm in arrangeLessonTermList)
                     {
+                        //学生课表请假表
                         StuAttendanceLeaveEntity stuAttendanceLeave = new StuAttendanceLeaveEntity();
                         stuAttendanceLeave.AcademicYearNo = arrangeLessonTerm.AcademicYearNo;
                         stuAttendanceLeave.Semester = arrangeLessonTerm.Semester;
@@ -500,12 +501,12 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                         stuAttendanceLeave.MajorNo = arrangeLessonTerm.MajorNo;
                         stuAttendanceLeave.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo)
                             .FirstOrDefault()?.MajorName;
-                        stuAttendanceLeave.ClassNo = arrangeLessonTerm.TeachClassNo;
+                        stuAttendanceLeave.ClassNo = arrangeLessonTerm.ClassNo;
                         stuAttendanceLeave.ClassName = classInfoList
-                            .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
+                            .Where(x => x.ClassNo == arrangeLessonTerm.ClassNo).FirstOrDefault()?.ClassName;
                         stuAttendanceLeave.LessonNo = arrangeLessonTerm.LessonNo;
                         stuAttendanceLeave.LessonName = arrangeLessonTerm.LessonName;
-                        stuAttendanceLeave.TeachClassNo = arrangeLessonTerm.TeachClassNo;
+                        stuAttendanceLeave.TeachClassNo = arrangeLessonTerm.ClassNo;
                         stuAttendanceLeave.LessonSortNo = arrangeLessonTerm.LessonSortNo;
                         stuAttendanceLeave.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
                         stuAttendanceLeave.LessonDate = arrangeLessonTerm.LessonDate;
@@ -535,7 +536,7 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                             db.Insert(stuAttendanceLeave);
                         }
 
-                        //学生考勤
+                        //学生考勤表
                         StuAttendanceEntity stuAttendanceEntity = new StuAttendanceEntity();
                         stuAttendanceEntity.AcademicYearNo = arrangeLessonTerm.AcademicYearNo;
                         stuAttendanceEntity.Semester = arrangeLessonTerm.Semester;
@@ -548,23 +549,23 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                             .FirstOrDefault()?.DeptName;
                         stuAttendanceEntity.MajorNo = arrangeLessonTerm.MajorNo;
                         stuAttendanceEntity.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo).FirstOrDefault()?.MajorName;
-                        stuAttendanceEntity.ClassNo = arrangeLessonTerm.TeachClassNo;
+                        stuAttendanceEntity.ClassNo = arrangeLessonTerm.ClassNo;
                         stuAttendanceEntity.ClassName = classInfoList
-                            .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
+                            .Where(x => x.ClassNo == arrangeLessonTerm.ClassNo).FirstOrDefault()?.ClassName;
                         stuAttendanceEntity.LessonNo = arrangeLessonTerm.LessonNo;
                         stuAttendanceEntity.LessonName = arrangeLessonTerm.LessonName;
-                        stuAttendanceEntity.TeachClassNo = arrangeLessonTerm.TeachClassNo;
+                        stuAttendanceEntity.TeachClassNo = arrangeLessonTerm.ClassNo;
                         stuAttendanceEntity.LessonSortNo = arrangeLessonTerm.LessonSortNo;
                         stuAttendanceEntity.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
                         stuAttendanceEntity.LessonDate = arrangeLessonTerm.LessonDate;
                         stuAttendanceEntity.PlanWeek = null;
                         stuAttendanceEntity.LessonTime = arrangeLessonTerm.LessonTime;
                         stuAttendanceEntity.AttendOrNo = "否";
-                        stuAttendanceEntity.Sort = Convert.ToInt32(model.LeaveType) == 2 ? "病假" : "事假";
+                        stuAttendanceEntity.Sort = "请假";
                         stuAttendanceEntity.EmpNo = arrangeLessonTerm.EmpNo;
-                        stuAttendanceEntity.Remark = "按天请假";
-                        stuAttendanceEntity.CheckMarkDept = "";
-                        stuAttendanceEntity.CheckMark = "";
+                        stuAttendanceEntity.Remark = "属于PC端的学生按天请假审核";
+                        stuAttendanceEntity.CheckMarkDept = "0";
+                        stuAttendanceEntity.CheckMark = "0";
                         stuAttendanceEntity.InertDate = DateTime.Now;
                         stuAttendanceEntity.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
                         stuAttendanceEntity.ClassRoomName = classRoomList.FirstOrDefault(x => x.ClassroomNo == arrangeLessonTerm.ClassroomNo)?.ClassroomName;