Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml

@@ -13,8 +13,8 @@
                     <div class="lr-layout-tool-item">
                         <div class=" btn-group btn-group-sm">
                             <script src="~/Content/vue/vue.js"></script>
-                            <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
-                            <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+                            <link rel="stylesheet" href="~/Content/elementui/index.css">
+                            <script src="~/Content/elementui/index.js"></script>
                             <div id="app">
                                 <a id="timeNoCludes" class="btn btn-default" v-on:click="nocludesVisible = true">时间段排除</a>
                                 <el-dialog title="时间段排除"

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs

@@ -29,6 +29,9 @@ namespace Learun.Application.WebApi.Modules
             Get["/teacher"] = GetTeachers;
             Get["/class"] = GetClasses;
             Get["/stu"] = GetStus;
+            Get["/classroomtype"] = GetClassroomType;
+            Get["/departments"] = GetDepartments;
+
             //以下返回全部
             Get["/department"] = GetDepartment;
             Get["/allteacher"] = GetAllTeachers;
@@ -173,9 +176,10 @@ namespace Learun.Application.WebApi.Modules
         }
         private Response GetDepts(dynamic _)
         {
-            string AcademicYearNo = Request.Query["AcademicYearNo"];
-            string Semester = Request.Query["Semester"];
-            var result = arrangeLessonTermIBLL.GetDepts(AcademicYearNo, Semester);
+            //string AcademicYearNo = Request.Query["AcademicYearNo"];
+            //string Semester = Request.Query["Semester"];
+            //var result = arrangeLessonTermIBLL.GetDepts(AcademicYearNo, Semester);
+            var result = arrangeLessonTermIBLL.GetDepts();
             return Success(result);
         }
         private Response GetDeptsNotRecord(dynamic _)
@@ -188,9 +192,10 @@ namespace Learun.Application.WebApi.Modules
 
         private Response GetSchools(dynamic _)
         {
-            string AcademicYearNo = Request.Query["AcademicYearNo"];
-            string Semester = Request.Query["Semester"];
-            var result = arrangeLessonTermIBLL.GetSchools(AcademicYearNo, Semester);
+            //string AcademicYearNo = Request.Query["AcademicYearNo"];
+            //string Semester = Request.Query["Semester"];
+            //var result = arrangeLessonTermIBLL.GetSchools(AcademicYearNo, Semester);
+            var result = arrangeLessonTermIBLL.GetSchools();
             return Success(result);
         }
         private Response GetSchoolsNotRecord(dynamic _)
@@ -223,9 +228,9 @@ namespace Learun.Application.WebApi.Modules
         }
         public Response GetMajors(dynamic _)
         {
-            string AcademicYearNo = Request.Query["AcademicYearNo"];
-            string Semester = Request.Query["Semester"];
-            var result = arrangeLessonTermIBLL.GetMajors(AcademicYearNo, Semester);
+            //string AcademicYearNo = Request.Query["AcademicYearNo"];
+            //string Semester = Request.Query["Semester"];
+            var result = arrangeLessonTermIBLL.GetMajors();
             return Success(result);
         }
         public Response GetMajorsNotRecord(dynamic _)
@@ -238,9 +243,7 @@ namespace Learun.Application.WebApi.Modules
 
         public Response GetClassrooms(dynamic _)
         {
-            string AcademicYearNo = Request.Query["AcademicYearNo"];
-            string Semester = Request.Query["Semester"];
-            var result = arrangeLessonTermIBLL.GetClassrooms(AcademicYearNo, Semester);
+            var result = arrangeLessonTermIBLL.GetClassrooms();
             return Success(result);
         }
         public Response GetClassroomsNotRecord(dynamic _)
@@ -258,9 +261,17 @@ namespace Learun.Application.WebApi.Modules
         }
         public Response GetLessons(dynamic _)
         {
-            string AcademicYearNo = Request.Query["AcademicYearNo"];
-            string Semester = Request.Query["Semester"];
-            var result = arrangeLessonTermIBLL.GetLessons(AcademicYearNo, Semester);
+            var result = arrangeLessonTermIBLL.GetLessons();
+            return Success(result);
+        }
+        public Response GetClassroomType(dynamic _)
+        {
+            var result = arrangeLessonTermIBLL.GetClassroomType();
+            return Success(result);
+        }
+        public Response GetDepartments(dynamic _)
+        {
+            var result = arrangeLessonTermIBLL.GetDepartments();
             return Success(result);
         }
         public Response GetLessonsNotRecord(dynamic _)
@@ -283,9 +294,7 @@ namespace Learun.Application.WebApi.Modules
 
         public Response GetTeachers(dynamic _)
         {
-            string AcademicYearNo = Request.Query["AcademicYearNo"];
-            string Semester = Request.Query["Semester"];
-            var result = arrangeLessonTermIBLL.GetTeachers(AcademicYearNo, Semester);
+            var result = arrangeLessonTermIBLL.GetTeachers();
             return Success(result);
         }
         public Response GetTeachersNotRecord(dynamic _)
@@ -298,9 +307,7 @@ namespace Learun.Application.WebApi.Modules
 
         public Response GetClasses(dynamic _)
         {
-            string AcademicYearNo = Request.Query["AcademicYearNo"];
-            string Semester = Request.Query["Semester"];
-            var result = arrangeLessonTermIBLL.GetClasses(AcademicYearNo, Semester);
+            var result = arrangeLessonTermIBLL.GetClasses();
             return Success(result);
         }
         public Response GetClassesNotRecord(dynamic _)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonSync/ArrangeLessonSyncEntity.cs

@@ -30,7 +30,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// 基础数据类型（1校区，2系部，3专业，4班级，5课程，6教室，7老师，8学生）
+        /// 基础数据类型（1校区，2系部，3专业，4班级，5课程，6教室，7老师，8学生,9教室类型, 10部门）
         /// </summary>
         [Column("STYPEID")]
         public string STypeId { get; set; }

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

@@ -242,9 +242,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             return data;
         }
 
-        public IEnumerable<CdMajorEntity> GetMajors(string academicYearNo, string semester)
+        public IEnumerable<CdMajorEntity> GetMajors()
         {
-            var data = arrangeLessonTermService.GetMajors(academicYearNo, semester);
+            var data = arrangeLessonTermService.GetMajors();
             return data;
         }
         public IEnumerable<CdMajorEntity> GetMajorsNotRecord(string academicYearNo, string semester)
@@ -253,9 +253,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             return data;
         }
 
-        public IEnumerable<ClassroomInfoEntity> GetClassrooms(string academicYearNo, string semester)
+        public IEnumerable<ClassroomInfoEntity> GetClassrooms()
         {
-            var data = arrangeLessonTermService.GetClassrooms(academicYearNo, semester);
+            var data = arrangeLessonTermService.GetClassrooms();
             return data;
         }
         public IEnumerable<ClassroomInfoEntity> GetClassroomsNotRecord(string academicYearNo, string semester)
@@ -270,11 +270,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             return data;
         }
 
-        public IEnumerable<LessonInfoEntity> GetLessons(string academicYearNo, string semester)
+        public IEnumerable<LessonInfoEntity> GetLessons()
         {
-            var data = arrangeLessonTermService.GetLessons(academicYearNo, semester);
+            var data = arrangeLessonTermService.GetLessons();
             return data;
         }
+        public IEnumerable<CdClassTypeEntity> GetClassroomType()
+        {
+            var data = arrangeLessonTermService.GetClassroomType();
+            return data;
+        }
+        public IEnumerable<DepartmentEntity> GetDepartments()
+        {
+            var data = arrangeLessonTermService.GetDepartments();
+            return data;
+        }        
         public IEnumerable<LessonInfoEntity> GetLessonsNotRecord(string academicYearNo, string semester)
         {
             var data = arrangeLessonTermService.GetLessonsNotRecord(academicYearNo, semester);
@@ -310,9 +320,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        public IEnumerable<CdDeptEntity> GetDepts(string academicYearNo, string semester)
+        public IEnumerable<CdDeptEntity> GetDepts()
         {
-            var data = arrangeLessonTermService.GetDepts(academicYearNo, semester);
+            var data = arrangeLessonTermService.GetDepts();
             return data;
         }
         public IEnumerable<CdDeptEntity> GetDeptsNotRecord(string academicYearNo, string semester)
@@ -321,9 +331,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             return data;
         }
 
-        public IEnumerable<CompanyEntity> GetSchools(string academicYearNo, string semester)
+        public IEnumerable<CompanyEntity> GetSchools()
         {
-            var data = arrangeLessonTermService.GetSchools(academicYearNo, semester);
+            var data = arrangeLessonTermService.GetSchools();
             return data;
         }
         public IEnumerable<CompanyEntity> GetSchoolsNotRecord(string academicYearNo, string semester)
@@ -386,9 +396,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             return data;
         }
 
-        public IEnumerable<EmpInfoEntity> GetTeachers(string academicYearNo, string semester)
+        public IEnumerable<EmpInfoEntity> GetTeachers()
         {
-            var data = arrangeLessonTermService.GetTeachers(academicYearNo, semester);
+            var data = arrangeLessonTermService.GetTeachers();
             return data;
         }
         public IEnumerable<EmpInfoEntity> GetTeachersNotRecord(string academicYearNo, string semester)
@@ -397,9 +407,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             return data;
         }
 
-        public IEnumerable<ClassInfoEntity> GetClasses(string academicYearNo, string semester)
+        public IEnumerable<ClassInfoEntity> GetClasses()
         {
-            var data = arrangeLessonTermService.GetClasses(academicYearNo, semester);
+            var data = arrangeLessonTermService.GetClasses();
             return data;
         }
         public IEnumerable<ClassInfoEntity> GetClassesNotRecord(string academicYearNo, string semester)

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

@@ -20,16 +20,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
 
         IEnumerable<StuSelectLessonListEntity> AttendanceStudents(Pagination pagination, string queryJson);
-        IEnumerable<CdMajorEntity> GetMajors(string academicYearNo, string semester);
+        IEnumerable<CdMajorEntity> GetMajors();
         IEnumerable<CdMajorEntity> GetMajorsNotRecord(string academicYearNo, string semester);
-        IEnumerable<ClassroomInfoEntity> GetClassrooms(string academicYearNo, string semester);
+        IEnumerable<ClassroomInfoEntity> GetClassrooms();
         IEnumerable<ClassroomInfoEntity> GetClassroomsNotRecord(string academicYearNo, string semester);
         IEnumerable<CdClassTypeEntity> GetClassType();
-        IEnumerable<LessonInfoEntity> GetLessons(string academicYearNo, string semester);
+        IEnumerable<LessonInfoEntity> GetLessons();
+        IEnumerable<CdClassTypeEntity> GetClassroomType();
+        IEnumerable<DepartmentEntity> GetDepartments();
+        
         IEnumerable<LessonInfoEntity> GetLessonsNotRecord(string academicYearNo, string semester);
-        IEnumerable<EmpInfoEntity> GetTeachers(string academicYearNo, string semester);
+        IEnumerable<EmpInfoEntity> GetTeachers();
         IEnumerable<EmpInfoEntity> GetTeachersNotRecord(string academicYearNo, string semester);
-        IEnumerable<ClassInfoEntity> GetClasses(string academicYearNo, string semester);
+        IEnumerable<ClassInfoEntity> GetClasses();
         IEnumerable<ClassInfoEntity> GetClassesNotRecord(string academicYearNo, string semester);
         IEnumerable<StuInfoBasicEntity> GetStus(string academicYearNo, string semester);
 
@@ -138,9 +141,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         IEnumerable<SelectModel> GetClassroomData(string schoolId);
         bool GetAny();
-        IEnumerable<CdDeptEntity> GetDepts(string academicYearNo, string semester);
+        IEnumerable<CdDeptEntity> GetDepts();
         IEnumerable<CdDeptEntity> GetDeptsNotRecord(string academicYearNo, string semester);
-        IEnumerable<CompanyEntity> GetSchools(string academicYearNo, string semester);
+        IEnumerable<CompanyEntity> GetSchools();
         IEnumerable<CompanyEntity> GetSchoolsNotRecord(string academicYearNo, string semester);
         IEnumerable<CdLessonTypeEntity> GetLessonTypes();
         IEnumerable<ArrangeLessonTermEntity> GetPageListForTeacherWorkload(Pagination paginationobj, string queryJson);

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

@@ -1303,14 +1303,14 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 }
             }
         }
-        public IEnumerable<CdMajorEntity> GetMajors(string academicYearNo, string semester)
+        public IEnumerable<CdMajorEntity> GetMajors()
         {
             try
             {
                 //var data = BaseRepository("CollegeMIS").FindList<CdMajorEntity>(m => m.CheckMark == true);
 
                 //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
-                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.STypeId == "3");
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "3");
                 if (aa == null)
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql("update CdMajor set SyncFlag='false' ");
@@ -1319,14 +1319,12 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 //数据
                 var db = BaseRepository("CollegeMIS");
                 db.BeginTrans();
-                var data = db.FindList<CdMajorEntity>("select * from CdMajor where CheckMark=1 and ID not in (select STableId from ArrangeLessonSync where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' )");
+                var data = db.FindList<CdMajorEntity>("select * from CdMajor where CheckMark=1 and ID not in (select STableId from ArrangeLessonSync  )");
                 DateTime syncdate = DateTime.Now;
                 foreach (var item in data.Select(m => m.ID))
                 {
                     ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
                     alsEntity.Create();
-                    alsEntity.AcademicYearNo = academicYearNo;
-                    alsEntity.Semester = semester;
                     alsEntity.STypeId = "3";
                     alsEntity.SDate = syncdate;
                     alsEntity.STableId = item;
@@ -1361,14 +1359,14 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
             }
         }
 
-        public IEnumerable<ClassroomInfoEntity> GetClassrooms(string academicYearNo, string semester)
+        public IEnumerable<ClassroomInfoEntity> GetClassrooms()
         {
             try
             {
                 //var data = BaseRepository("CollegeMIS").FindList<ClassroomInfoEntity>(m => m.CheckMark == true);
 
                 //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
-                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.STypeId == "6");
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "6");
                 if (aa == null)
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql("update ClassroomInfo set SyncFlag='false' ");
@@ -1377,14 +1375,12 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 //数据
                 var db = BaseRepository("CollegeMIS");
                 db.BeginTrans();
-                var data = db.FindList<ClassroomInfoEntity>("select * from ClassroomInfo where CheckMark=1 and ClassroomId not in (select STableId from ArrangeLessonSync where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' )");
+                var data = db.FindList<ClassroomInfoEntity>("select * from ClassroomInfo where CheckMark=1 and ClassroomId not in (select STableId from ArrangeLessonSync )");
                 DateTime syncdate = DateTime.Now;
                 foreach (var item in data.Select(m => m.ClassroomId))
                 {
                     ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
                     alsEntity.Create();
-                    alsEntity.AcademicYearNo = academicYearNo;
-                    alsEntity.Semester = semester;
                     alsEntity.STypeId = "6";
                     alsEntity.SDate = syncdate;
                     alsEntity.STableId = item;
@@ -1432,15 +1428,89 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 throw;
             }
         }
+        
+        public IEnumerable<CdClassTypeEntity> GetClassroomType()
+        {
+            try
+            {
+                //var data = BaseRepository("CollegeMIS").FindList<LessonInfoEntity>(m => m.CheckMark == true);
+
+                //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "9");
+                if (aa == null)
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update CdClassType set SyncFlag='false' ");
+                }
+
+                //数据
+                var db = BaseRepository("CollegeMIS");
+                db.BeginTrans();
+                var data = db.FindList<CdClassTypeEntity>("select * from CdClassType where 1=1 and ClassroomTypeId not in (select STableId from ArrangeLessonSync  )");
+                DateTime syncdate = DateTime.Now;
+                foreach (var item in data.Select(m => m.ClassroomTypeId))
+                {
+                    ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
+                    alsEntity.Create();
+                    alsEntity.STypeId = "9";
+                    alsEntity.SDate = syncdate;
+                    alsEntity.STableId = item;
+                    db.Insert(alsEntity);
+                }
+                db.Commit();
+                return data;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
+
+        public IEnumerable<DepartmentEntity> GetDepartments()
+        {
+            try
+            {
+                //var data = BaseRepository("CollegeMIS").FindList<LessonInfoEntity>(m => m.CheckMark == true);
 
-        public IEnumerable<LessonInfoEntity> GetLessons(string academicYearNo, string semester)
+                //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "10");
+                if (aa == null)
+                {
+                    this.BaseRepository().ExecuteBySql("update LR_Base_Department set SyncFlag='false' ");
+                }
+
+                //数据
+                var db = BaseRepository("CollegeMIS");
+                var dbbase = BaseRepository();
+                db.BeginTrans();
+                var data = db.FindList<DepartmentEntity>("select * from " + dbbase.getDbConnection().Database + ".dbo.LR_Base_Department where F_EnabledMark = 1 AND F_DeleteMark = 0 and F_DepartmentId not in (select STableId from ArrangeLessonSync  )");
+                DateTime syncdate = DateTime.Now;
+                foreach (var item in data.Select(m => m.F_DepartmentId))
+                {
+                    ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
+                    alsEntity.Create();
+                    alsEntity.STypeId = "10";
+                    alsEntity.SDate = syncdate;
+                    alsEntity.STableId = item;
+                    db.Insert(alsEntity);
+                }
+                db.Commit();
+                return data;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
+        public IEnumerable<LessonInfoEntity> GetLessons()
         {
             try
             {
                 //var data = BaseRepository("CollegeMIS").FindList<LessonInfoEntity>(m => m.CheckMark == true);
 
                 //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
-                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.STypeId == "5");
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "5");
                 if (aa == null)
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql("update LessonInfo set SyncFlag='false' ");
@@ -1449,14 +1519,12 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 //数据
                 var db = BaseRepository("CollegeMIS");
                 db.BeginTrans();
-                var data = db.FindList<LessonInfoEntity>("select * from LessonInfo where CheckMark=1 and LessonId not in (select STableId from ArrangeLessonSync where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' )");
+                var data = db.FindList<LessonInfoEntity>("select * from LessonInfo where CheckMark=1 and LessonId not in (select STableId from ArrangeLessonSync  )");
                 DateTime syncdate = DateTime.Now;
                 foreach (var item in data.Select(m => m.LessonId))
                 {
                     ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
                     alsEntity.Create();
-                    alsEntity.AcademicYearNo = academicYearNo;
-                    alsEntity.Semester = semester;
                     alsEntity.STypeId = "5";
                     alsEntity.SDate = syncdate;
                     alsEntity.STableId = item;
@@ -1519,14 +1587,14 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
             }
         }
 
-        public IEnumerable<EmpInfoEntity> GetTeachers(string academicYearNo, string semester)
+        public IEnumerable<EmpInfoEntity> GetTeachers()
         {
             try
             {
                 //var data = BaseRepository("CollegeMIS").FindList<EmpInfoEntity>("select a.*,b.F_Password,b.F_Secretkey from dbo.EmpInfo a left join adms7ultimate2.dbo.LR_Base_User b  on a.EmpNo=b.F_EnCode where a.CheckMark=1");
 
                 //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
-                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.STypeId == "7");
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "7");
                 if (aa == null)
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql("update EmpInfo set SyncFlag='false' ");
@@ -1536,14 +1604,12 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 var db = BaseRepository("CollegeMIS");
                 var dbbase = BaseRepository();
                 db.BeginTrans();
-                var data = db.FindList<EmpInfoEntity>("select a.*,b.F_Password,b.F_Secretkey from dbo.EmpInfo a left join " + dbbase.getDbConnection().Database + ".dbo.LR_Base_User b  on a.EmpNo=b.F_EnCode where a.CheckMark=1 and a.ishaslesson=1 and b.F_DeleteMark=0 and a.EmpId not in (select STableId from ArrangeLessonSync where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' )");
+                var data = db.FindList<EmpInfoEntity>("select a.*,b.F_Password,b.F_Secretkey from dbo.EmpInfo a left join " + dbbase.getDbConnection().Database + ".dbo.LR_Base_User b  on a.EmpNo=b.F_EnCode where a.CheckMark=1 and a.ishaslesson=1 and b.F_DeleteMark=0 and a.EmpId not in (select STableId from ArrangeLessonSync  )");
                 DateTime syncdate = DateTime.Now;
                 foreach (var item in data.Select(m => m.EmpId))
                 {
                     ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
                     alsEntity.Create();
-                    alsEntity.AcademicYearNo = academicYearNo;
-                    alsEntity.Semester = semester;
                     alsEntity.STypeId = "7";
                     alsEntity.SDate = syncdate;
                     alsEntity.STableId = item;
@@ -1579,14 +1645,14 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
             }
         }
 
-        public IEnumerable<ClassInfoEntity> GetClasses(string academicYearNo, string semester)
+        public IEnumerable<ClassInfoEntity> GetClasses()
         {
             try
             {
                 //var data = BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(m => m.CheckMark == true);
 
                 //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
-                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.STypeId == "4");
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "4");
                 if (aa == null)
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql("update ClassInfo set SyncFlag='false' ");
@@ -1595,14 +1661,12 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 //数据
                 var db = BaseRepository("CollegeMIS");
                 db.BeginTrans();
-                var data = db.FindList<ClassInfoEntity>("select * from ClassInfo where CheckMark=1 and ClassId not in (select STableId from ArrangeLessonSync where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' )");
+                var data = db.FindList<ClassInfoEntity>("select * from ClassInfo where CheckMark=1 and ClassId not in (select STableId from ArrangeLessonSync  )");
                 DateTime syncdate = DateTime.Now;
                 foreach (var item in data.Select(m => m.ClassId))
                 {
                     ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
                     alsEntity.Create();
-                    alsEntity.AcademicYearNo = academicYearNo;
-                    alsEntity.Semester = semester;
                     alsEntity.STypeId = "4";
                     alsEntity.SDate = syncdate;
                     alsEntity.STableId = item;
@@ -1948,14 +2012,14 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
             }
         }
 
-        public IEnumerable<CdDeptEntity> GetDepts(string academicYearNo, string semester)
+        public IEnumerable<CdDeptEntity> GetDepts()
         {
             try
             {
                 //var data = BaseRepository("CollegeMIS").FindList<CdDeptEntity>();
 
                 //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
-                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.STypeId == "2");
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "2");
                 if (aa == null)
                 {
                     this.BaseRepository("CollegeMIS").ExecuteBySql("update CdDept set SyncFlag='false' ");
@@ -1964,14 +2028,12 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                 //数据
                 var db = BaseRepository("CollegeMIS");
                 db.BeginTrans();
-                var data = db.FindList<CdDeptEntity>("select * from CdDept where DeptId not in (select STableId from ArrangeLessonSync where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' )");
+                var data = db.FindList<CdDeptEntity>("select * from CdDept where DeptId not in (select STableId from ArrangeLessonSync  )");
                 DateTime syncdate = DateTime.Now;
                 foreach (var item in data.Select(m => m.DeptId))
                 {
                     ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
                     alsEntity.Create();
-                    alsEntity.AcademicYearNo = academicYearNo;
-                    alsEntity.Semester = semester;
                     alsEntity.STypeId = "2";
                     alsEntity.SDate = syncdate;
                     alsEntity.STableId = item;
@@ -2006,14 +2068,14 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
             }
         }
 
-        public IEnumerable<CompanyEntity> GetSchools(string academicYearNo, string semester)
+        public IEnumerable<CompanyEntity> GetSchools()
         {
             try
             {
                 //var data = BaseRepository().FindList<CompanyEntity>();
 
                 //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false；
-                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.STypeId == "1");
+                var aa = this.BaseRepository("CollegeMIS").FindEntity<ArrangeLessonSyncEntity>(x => x.STypeId == "1");
                 if (aa == null)
                 {
                     this.BaseRepository().ExecuteBySql("update LR_Base_Company set SyncFlag='false' ");
@@ -2022,14 +2084,12 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                 //数据
                 var dbCollegeMIS = BaseRepository("CollegeMIS");
                 dbCollegeMIS.BeginTrans();
-                var data = BaseRepository().FindList<CompanyEntity>("select * from LR_Base_Company where F_CompanyId not in (select STableId from " + dbCollegeMIS.getDbConnection().Database + ".dbo.ArrangeLessonSync where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' )");
+                var data = BaseRepository().FindList<CompanyEntity>("select * from LR_Base_Company where F_CompanyId not in (select STableId from " + dbCollegeMIS.getDbConnection().Database + ".dbo.ArrangeLessonSync  )");
                 DateTime syncdate = DateTime.Now;
                 foreach (var item in data.Select(m => m.F_CompanyId))
                 {
                     ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity();
                     alsEntity.Create();
-                    alsEntity.AcademicYearNo = academicYearNo;
-                    alsEntity.Semester = semester;
                     alsEntity.STypeId = "1";
                     alsEntity.SDate = syncdate;
                     alsEntity.STableId = item;

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/wxFn.js

@@ -57,7 +57,7 @@ export default {
 				}
 				wx.getLocation({
 					type: "gcj02", // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-					success: function(res) {
+					success: (res) => {
 						var latitude = res.latitude; // 纬度，浮点数，范围为90 ~ -90
 						var longitude = res.longitude; // 经度，浮点数，范围为180 ~ -180。
 						var speed = res.speed; // 速度，以米/每秒计
@@ -67,7 +67,7 @@ export default {
 							lng:longitude
 						})
 					},
-					fail: function(error) {
+					fail: (error) => {
 						this.TOAST("获取定位失败！")
 						resolve(false)
 					}

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

@@ -108,7 +108,7 @@
 		methods: {
 			// 页面初始化 
 			async init() {
-				this.isInternalNetwork(false)
+				await this.isInternalNetwork(false)
 				this.LOADING('加载数据中...')
 
 				this.now = this.getCurrentTime()
@@ -178,33 +178,35 @@
 					AttendanceType:this.info.AttendanceType,
 					AttendanceTypeString:this.info.AttendanceTypeString,
 				}
-				if (![5].includes(this.info.AttendanceType)) {
-					this.$set(this.info, 'AttendanceType', 4)
-					this.$set(this.info, 'AttendanceTypeString', '外勤打卡')
-					this.$set(this.postData, 'AIsOut', 1)
-					// 获取定位，不是外勤时候改变状态
-					// if (!window.BMapGL) await this.loadJScript()
-					if(!window.BMapGL || !BMapGL.Map){
-						this.TOAST('获取定位资源失败！')
-						return false
-					}
-					this.map = new BMapGL.Map('container');
-					
-					await this.isFieldPersonnel()
+				
+				if ([5].includes(this.info.AttendanceType)) return true
+				
+				this.$set(this.info, 'AttendanceType', 4)
+				this.$set(this.info, 'AttendanceTypeString', '外勤打卡')
+				this.$set(this.postData, 'AIsOut', 1)
+				// 获取定位，不是外勤时候改变状态
+				// if (!window.BMapGL) await this.loadJScript()
+				if(!window.BMapGL || !BMapGL.Map){
+					this.TOAST('获取定位资源失败！')
+					return false
+				}
+				this.map = new BMapGL.Map('container');
+				
+				await this.isFieldPersonnel()
+				if(!this.postData.ClockPlace){
+					return true
+				}
+				this.timer1 = setInterval(async ()=>{
+					if(this.isGetingLocal)return
 					if(!this.postData.ClockPlace){
-						return true
+						clearInterval(this.timer1)
 					}
-					this.timer1 = setInterval(async ()=>{
-						if(this.isGetingLocal)return
-						if(!this.postData.ClockPlace){
-							clearInterval(this.timer1)
-						}
-						this.isGetingLocal = true
-						await this.isFieldPersonnel()
-						// console.log(this.postData)
-						this.isGetingLocal = false
-					},3000)
-				}
+					this.isGetingLocal = true
+					await this.isFieldPersonnel()
+					// console.log(this.postData)
+					this.isGetingLocal = false
+				},3000)
+				
 				return true
 			},
 			//返回
@@ -284,7 +286,7 @@
 						resolve(false)
 					}
 					new BMapGL.Convertor().translate([res], 3, 5, data => {
-						if (data.status == 0) {
+						if (data&&data.status == 0) {
 							// alert(data.points[0].lng + '' + data.points[0].lat)
 							this.$set(this.postData, 'ALon', data.points[0].lng)
 							this.$set(this.postData, 'ALat', data.points[0].lat)
@@ -304,7 +306,7 @@
 							this.$set(this.postData, 'ALon', '')
 							this.$set(this.postData, 'ALat', '')
 							this.$set(this.postData, 'ClockPlace', '')
-							this.TOAST('获取定位失败！')
+							this.TOAST('定位获取失败！')
 							resolve(false)
 						}
 
@@ -322,8 +324,8 @@
 			},
 			// 判断是否学校网络
 			isInternalNetwork(TOAST=true){
-				this.LOADING()
-				this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{
+				this.LOADING('加载数据中...')
+				return this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{
 					this.HIDE_LOADING()
 					let res_ = res[1]
 					let client_ip_start = '1.190.222.'