Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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

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

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

@@ -263,7 +263,7 @@ 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 from [dbo].[ArrangeLessonTerm] a
+                        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
 where b.stuno='{model.CreateUserNo}'
 and a.lessondate between '{startTime}' and '{endTime}'");
@@ -271,6 +271,8 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                         var deptList = db.FindList<CdDeptEntity>();
                         var majorList = db.FindList<CdMajorEntity>();
                         var classInfoList = db.FindList<ClassInfoEntity>();
+                        var classRoomList = db.FindList<ClassroomInfoEntity>().ToList();
+                        var lessonSortList = db.FindList<CdLessonSortEntity>().ToList();
                         foreach (var arrangeLessonTerm in arrangeLessonTermList)
                         {
                             StuAttendanceLeaveEntity stuAttendanceLeave = new StuAttendanceLeaveEntity();
@@ -293,14 +295,53 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                             stuAttendanceLeave.LessonName = arrangeLessonTerm.LessonName;
                             stuAttendanceLeave.TeachClassNo = arrangeLessonTerm.TeachClassNo;
                             stuAttendanceLeave.LessonSortNo = arrangeLessonTerm.LessonSortNo;
-                            //stuAttendanceLeave.LessonSortName = arrangeLessonTerm.LessonSortName;
+                            stuAttendanceLeave.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
                             stuAttendanceLeave.LessonDate = arrangeLessonTerm.LessonDate;
                             stuAttendanceLeave.LessonTime = arrangeLessonTerm.LessonTime;
                             stuAttendanceLeave.LeaveType = "1";
                             stuAttendanceLeave.EmpNo = arrangeLessonTerm.EmpNo;
                             stuAttendanceLeave.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
+                            stuAttendanceLeave.UpdateDate = DateTime.Now;
+                            stuAttendanceLeave.IsCheck = "1";
+                            stuAttendanceLeave.TecRemark = "按天请假";
 
                             db.Insert(stuAttendanceLeave);
+
+                            //学生考勤
+                            StuAttendanceEntity stuAttendanceEntity = new StuAttendanceEntity();
+                            stuAttendanceEntity.AcademicYearNo = arrangeLessonTerm.AcademicYearNo;
+                            stuAttendanceEntity.ClassName = classInfoList
+                                .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
+                            stuAttendanceEntity.ClassNo = arrangeLessonTerm.TeachClassNo;
+                            stuAttendanceEntity.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)
+                                .FirstOrDefault()?.DeptName;
+                            stuAttendanceEntity.DeptNo = arrangeLessonTerm.DeptNo;
+                            stuAttendanceEntity.EmpNo = arrangeLessonTerm.EmpNo;
+                            stuAttendanceEntity.Grade = arrangeLessonTerm.Grade;
+                            stuAttendanceEntity.InertDate = DateTime.Now;
+                            stuAttendanceEntity.LessonDate = arrangeLessonTerm.LessonDate;
+                            stuAttendanceEntity.LessonName = arrangeLessonTerm.LessonName;
+                            stuAttendanceEntity.LessonNo = arrangeLessonTerm.LessonNo;
+                            stuAttendanceEntity.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
+                            stuAttendanceEntity.LessonSortNo = arrangeLessonTerm.LessonSortNo;
+                            stuAttendanceEntity.LessonTime = arrangeLessonTerm.LessonTime;
+                            stuAttendanceEntity.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo).FirstOrDefault()?.MajorName;
+                            stuAttendanceEntity.MajorNo = arrangeLessonTerm.MajorNo;
+                            stuAttendanceEntity.PlanWeek = null;
+                            stuAttendanceEntity.Semester = arrangeLessonTerm.Semester;
+                            stuAttendanceEntity.StuName = arrangeLessonTerm.StuName;
+                            stuAttendanceEntity.StuNo = model.CreateUserNo;
+                            stuAttendanceEntity.TeachClassNo = arrangeLessonTerm.TeachClassNo;
+                            stuAttendanceEntity.Sort = "请假";
+                            stuAttendanceEntity.AttendOrNo = "否";
+                            stuAttendanceEntity.ClassRoomName = classRoomList.Find(x => x.ClassroomId.Trim() == arrangeLessonTerm.ClassroomNo.Trim())?.ClassroomName.Trim();
+                            stuAttendanceEntity.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
+                            stuAttendanceEntity.Gender = arrangeLessonTerm.GenderNo.Trim() == "0" ? "女" : "男";
+                            stuAttendanceEntity.CheckMarkDept = "";
+                            stuAttendanceEntity.CheckMark = "";
+                            stuAttendanceEntity.Create();
+                            db.Insert(stuAttendanceEntity);
+
                         }
                     }
                 }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -23,7 +23,7 @@ export default {
   "apiHost": [
     // "http://cyzjzx.gnway.cc:31218/"//测试地址接口
 	 // "http://cyzjzx.gnway.cc:29904/"//正式地址接口
-	 "http://192.168.10.31:8088/"
+	 "http://192.168.10.58:8012/"
   ],
   // "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址
   // "webHost":"http://wxd3f.cyzjzx.com/",//正式地址