diff --git a/Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园基础信息接口V1.0.docx b/Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园基础信息接口V1.0.docx index 8d7eaece8..4fdef60c9 100644 --- a/Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园基础信息接口V1.0.docx +++ b/Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园基础信息接口V1.0.docx @@ -461,4 +461,973 @@ FailMsg +调用方式： +标准http get请求 +返回数据类型： +标准json +返回数据结构 +主要关心code和data即可 + + 属性 + 返回值 + 备注 +code +200(int) +200成功 其余失败 +info +响应成功(string) +状态描述 +data +业务数据(object) +业务数据 + +查看数据接口 +学院接口 +地址：http://部署地址/arrangelesson/schoolNotRecord +数据库表：LR_Base_Company （基础库） +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +F_CompanyId +GUID (string) +GUID学院ID +否 +F_Category +分类ID（INT） + + +F_ParentId +父级ID(string) + +否 +F_EnCode +学院编号(string) + +否 +F_FullName +学院全称(string) + +否 +F_ShortName +学院简称(string) + + +F_Nature +学院性质(string) + + +F_OuterPhone +外线电话(string) + + +F_InnerPhone +内线电话(string) + + +F_Fax +传真(string) + + +F_Postalcode +邮编(string) + + +F_Email +电子信箱(string) + + +F_Manager +负责人(string) + + +F_Address +详细地址(string) + + +F_WebAddress +主页(string) + + +F_FoundedTime +成立时间(DateTime) + + +F_Description +备注(string) + + + +系部接口 +地址：http://部署地址/arrangelesson/ deptNotRecord +表：CDDEPT （业务库） +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +DeptId +GUID (string) +GUID部门ID +否 +F_SchoolId +学校ID(string) + +否 +DeptNo +部门编号(string) + +否 +DeptName +部门全称(string) + +否 +DeptShortName +部门简称(string) + + +DeptEnBrief +英文名称(string) + + +DeptEnShort +英文简称(string) + + +DeptOldName +曾用名(string) + + + +专业接口 +地址：http://部署地址/arrangelesson/ majorNotRecord +表：CDMAJOR （业务库） +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +ID +GUID (string) +GUID专业ID +否 +MajorNo +专业编号(string) + +否 +MajorName +专业名称(string) + +否 +DeptNo +系部编号(string) + + +SubjectSpeciesNo +学科门类代码(string) + + +GovMajorName +教委专业名称(string) + + + +教室接口 +地址：http://部署地址/arrangelesson/ classroomNotRecord +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +ClassroomId +GUID (string) + +否 +ClassroomNo +编号(string) + +否 +ClassroomName +名称(string) + +否 +ClassroomTypeNo +教室类型 (string) + + +ClassroomFloor +教室楼层(string) + + +ClassroomBuildingNo +教学楼(string) + + + +课程接口 +地址：http://部署地址/arrangelesson/ lessonNotRecord +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +LessonId +GUID (string) +GUI课程ID +否 +LessonNo +课程编号(string) + +否 +LessonName +课程名称(string) + +否 +LessonSortNo +课程类型(string) +1必修，2选修 + +F_SchoolId +校区Id(string) + + +StudyScore +学分(decimal) + + +WeekStudyHour +周理论学时(decimal) + + +TotalHours +总学时(decimal) + + +WhoStudy +修读对象(string) + + +BriefIntro +简介(string) + + + + + + + + +教师接口 +地址：http://部署地址/arrangelesson/ teacherNotRecord +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +EmpId +GUID (string) +GUID教师ID +否 +EmpNo +教职工编号(string) + +否 +EmpName +职工姓名(string) + +否 +GenderNo +性别(bool) +true男false女 + +Birthday +生日(datetime) + + +F_DepartmentId +部门ID(string) + + +mobile +电话(string) + + +EmpFullTimeNo +专兼职(string) + + +IsInActiveStatus +在职状态(string) +1在职0离职 + +CultureDegreeNo +文化程序(string) + + +HighestRecord +最高学历(string) + + +resume +简介(string) + + + +班级接口 +地址：http://部署地址/arrangelesson/ classNotRecord +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +ClassId +GUID (string) +GUI班级ID +否 +ClassNo +班级编号(string) + +否 +ClassName +班级名称(string) + +否 +DeptNo +系部编号(string) + + +MajorNo +专业编号(string) + + +Grade +级别（18代表2018级，19表示2019级）(string) + + + + +学生接口 +地址：http://部署地址/arrangelesson/ stuNotRecord +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +StuId +GUID (string) +GUID学生ID +否 +StuNo +学生编号(string) + +否 +StuName +姓名(string) + +否 +StuCode +学籍号(string) + + +ksh +考生号(string) + + +GenderNo +性别(bool) +true男false女 + +Birthday +生日(datetime) + + +mobile +电话(string) + + +IdentityCardNo +身份证号(string) + + +DeptNo +系部编号(string) + + +MajorNo +专业编号(string) + + +Grade +级别（18代表2018级，19表示2019级）(string) + + +ClassNo +班级编号(string) + + + +对接数据接口 +学院接口 +地址：http://部署地址/arrangelesson/ school +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +F_CompanyId +GUID (string) +GUID学院ID +否 +F_Category +分类ID（INT） + + +F_ParentId +父级ID(string) + +否 +F_EnCode +学院编号(string) + +否 +F_FullName +学院全称(string) + +否 +F_ShortName +学院简称(string) + + +F_Nature +学院性质(string) + + +F_OuterPhone +外线电话(string) + + +F_InnerPhone +内线电话(string) + + +F_Fax +传真(string) + + +F_Postalcode +邮编(string) + + +F_Email +电子信箱(string) + + +F_Manager +负责人(string) + + +F_Address +详细地址(string) + + +F_WebAddress +主页(string) + + +F_FoundedTime +成立时间(DateTime) + + +F_Description +备注(string) + + + + + +系部接口 +地址：http://部署地址/arrangelesson/ dept + +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +DeptId +GUID (string) +GUID部门ID +否 +F_SchoolId +学校ID(string) + +否 +DeptNo +部门编号(string) + +否 +DeptName +部门全称(string) + +否 +DeptShortName +部门简称(string) + + +DeptEnBrief +英文名称(string) + + +DeptEnShort +英文简称(string) + + +DeptOldName +曾用名(string) + + + +专业接口 +地址：http://部署地址/arrangelesson/ major +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +ID +GUID (string) +GUID专业ID +否 +MajorNo +专业编号(string) + +否 +MajorName +专业名称(string) + +否 +DeptNo +系部编号(string) + + +SubjectSpeciesNo +学科门类代码(string) + + +GovMajorName +教委专业名称(string) + + + +班级接口 +地址：http://部署地址/arrangelesson/ class +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +ClassId +GUID (string) +GUI班级ID +否 +ClassNo +班级编号(string) + +否 +ClassName +班级名称(string) + +否 +DeptNo +系部编号(string) + + +MajorNo +专业编号(string) + + +Grade +级别（18代表2018级，19表示2019级）(string) + + +教师接口 +地址：http://部署地址/arrangelesson/ teacher +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +EmpId +GUID (string) +GUID教师ID +否 +EmpNo +教职工编号(string) + +否 +EmpName +职工姓名(string) + +否 +GenderNo +性别(bool) +true男false女 + +Birthday +生日(datetime) + + +F_DepartmentId +部门ID(string) + + +mobile +电话(string) + + +EmpFullTimeNo +专兼职(string) + + +IsInActiveStatus +在职状态(string) +1在职0离职 + +CultureDegreeNo +文化程序(string) + + +HighestRecord +最高学历(string) + + +resume +简介(string) + + +教室接口 +地址：http://部署地址/arrangelesson/ classroom +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +ClassroomId +GUID (string) + +否 +ClassroomNo +编号(string) + +否 +ClassroomName +名称(string) + +否 +ClassroomTypeNo +教室类型 (string) + + +ClassroomFloor +教室楼层(string) + + +ClassroomBuildingNo +教学楼(string) + + +教室类型接口 +地址：http://部署地址/arrangelesson/ classroomtype +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +ClassroomTypeId +GUID (string) + +否 +ClassroomTypeNo +类型名称(string) + +否 +ClassroomType +类型编号(string) + +否 + + +课程接口 +地址：http://部署地址/arrangelesson/ lesson +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +LessonId +GUID (string) +GUI课程ID +否 +LessonNo +课程编号(string) + +否 +LessonName +课程名称(string) + +否 +LessonSortNo +课程类型(string) +1必修，2选修 + +F_SchoolId +校区Id(string) + + +StudyScore +学分(decimal) + + +WeekStudyHour +周理论学时(decimal) + + +TotalHours +总学时(decimal) + + +WhoStudy +修读对象(string) + + +BriefIntro +简介(string) + + + + + + + +课程类型接口 +地址：http://部署地址/arrangelesson/ lessontype +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +LTId +GUID (string) + +否 +LessonTypeName +类型名称(string) + +否 +LessonTypeCode +类型编号(string) + +否 + +学生接口 +地址：http://部署地址/arrangelesson/ stu +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +StuId +GUID (string) +GUID学生ID +否 +StuNo +学生编号(string) + +否 +StuName +姓名(string) + +否 +StuCode +学籍号(string) + + +ksh +考生号(string) + + +GenderNo +性别(bool) +true男false女 + +Birthday +生日(datetime) + + +mobile +电话(string) + + +IdentityCardNo +身份证号(string) + + +DeptNo +系部编号(string) + + +MajorNo +专业编号(string) + + +Grade +级别（18代表2018级，19表示2019级）(string) + + +ClassNo +班级编号(string) + + + +部门接口 +地址：http://部署地址/arrangelesson/ departments +主要业务数据 其余字段可忽略 + 属性 + 返回值 + 备注 + 可否为空 +F_DepartmentId +GUID (string) +GUID部门ID +否 +F_ParentId +上级部门ID(string) +-1和0均代表根 +否 +F_EnCode +部门编号(string) +部门编号 +否 +F_FullName +部门全称(string) + +否 +F_ShortName +部门简称(string) + + +F_Manager +负责人(string) + + +F_OuterPhone +电话(string) + + +数校清空基础数据 +地址：http://部署地址/arrangelesson/ initbasicdata +所需参数：AcademicYearNo=19-20&Semester=1 +参数名称 +值 +备注 +AcademicYearNo +19-20 +代表学年19-20、18-19等 +Semester +1、2 +学期1、2 +BaseTable + +基础表 + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml index c939bb92c..cd68b2d97 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml @@ -22,7 +22,7 @@
- +
 查询 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index da47d6748..36b09e059 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -39,10 +39,10 @@ var bootstrap = function ($, learun) { var AcademicYearNo = $('#AcademicYearNo').lrselectGet(); var Semester = $('#Semester').lrselectGet(); var StuNo = $.trim($('#StuNo').val()); - if (StuNo == null || StuNo == "") { - learun.alert.warning("请输入学号！"); - return; - } + //if (StuNo == null || StuNo == "") { + // learun.alert.warning("请输入学号！"); + // return; + //} var LessonNo = $('#LessonNo').lrselectGet(); var Grade = $('#Grade').lrselectGet(); learun.layerForm({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js index 0e3fe997f..48ebb33be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js @@ -9,11 +9,7 @@ $(document).ready(function () { } var qrCodeBox = $('.qrCodeBox'); var loginForm = $('#loginForm'); - //var qrcode = new QRCode(document.getElementById("qrCode"), { - // width: 200, - // height: 200 - //}); - //makeCode('http://192.168.1.126:8081/Login/Index'); + // header search $(document).on('click', function () { $('.skinBox').removeClass('active'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index ef5fbb8c7..6a73e1ddd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -896,6 +896,12 @@ namespace Learun.Application.Web.Controllers /// public ActionResult NoLogin() { + var refe = Request.UrlReferrer.ToString(); + + var host = Request.Url.Host; + + if (!refe.Contains(host)) return Content("请正确访问系统"); + //获取错误次数 ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum(); //获取高职版跳转地址 @@ -914,6 +920,10 @@ namespace Learun.Application.Web.Controllers var result4 = teachSwitchIBLL.FindFirst("wxloginforpc"); ViewBag.WeixinLoginSwitch = result4; + HttpContext.Response.Headers.Add("Cache-Control", "no-cache"); + HttpContext.Response.Headers.Add("pragma", "no-cache"); + HttpContext.Response.Headers.Add("expires", "0"); + return View("DragNoLogin"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml index be96f4c2d..9fc4c42eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml @@ -5,6 +5,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs index 1e81ddef1..0e72a1209 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs @@ -21,6 +21,7 @@ namespace Learun.Application.WebApi.Modules Get["/classlesson"] = GetClassLessons; Get["/bukaolist"] = GetBuKaoList; //以下接口需要传值学年学期 + //2024/6/27取消学年学期参数 Get["/school"] = GetSchools; Get["/dept"] = GetDepts; Get["/major"] = GetMajors; @@ -108,20 +109,20 @@ namespace Learun.Application.WebApi.Modules } private Response InitBasicData(dynamic _) { - string AcademicYearNo = Request.Query["AcademicYearNo"]; - string Semester = Request.Query["Semester"]; + //string AcademicYearNo = Request.Query["AcademicYearNo"]; + //string Semester = Request.Query["Semester"]; string BaseTable = Request.Query["BaseTable"]; - if (string.IsNullOrEmpty(AcademicYearNo) || string.IsNullOrEmpty(Semester)) - { - return Fail("学年学期参数不能为空"); - } - if (string.IsNullOrEmpty(BaseTable)) - { - return Fail("基础表参数不能为空"); - } + //if (string.IsNullOrEmpty(AcademicYearNo) || string.IsNullOrEmpty(Semester)) + //{ + // return Fail("学年学期参数不能为空"); + //} + //if (string.IsNullOrEmpty(BaseTable)) + //{ + // return Fail("基础表参数不能为空"); + //} ArrangeLessonTermEntity arrangeLessonTermEntity = new ArrangeLessonTermEntity(); - arrangeLessonTermEntity.AcademicYearNo = AcademicYearNo; - arrangeLessonTermEntity.Semester = Semester; + //arrangeLessonTermEntity.AcademicYearNo = AcademicYearNo; + //arrangeLessonTermEntity.Semester = Semester; arrangeLessonTermEntity.SyncBasicTable = BaseTable; arrangeLessonTermIBLL.InitAsyncDataByCondition(arrangeLessonTermEntity); return Success("操作成功"); @@ -320,9 +321,9 @@ namespace Learun.Application.WebApi.Modules public Response GetStus(dynamic _) { - string AcademicYearNo = Request.Query["AcademicYearNo"]; - string Semester = Request.Query["Semester"]; - var result = arrangeLessonTermIBLL.GetStus(AcademicYearNo, Semester); + //string AcademicYearNo = Request.Query["AcademicYearNo"]; + //string Semester = Request.Query["Semester"]; + var result = arrangeLessonTermIBLL.GetStus(); return Success(result); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs index 2123e9d85..7dca3b3a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs @@ -70,7 +70,7 @@ namespace Learun.Application.WebApi.Modules ScoreOfNotPass = y.ScoreOfNotPass, ScoreOfNotPassTwo = y.ScoreOfNotPassTwo }).OrderBy(a => a.LessonSortNo).ThenBy(a => a.LessonNo).ToList() - }).ToList().OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester); + }).ToList().OrderByDescending(x => x.AcademicYearNo).ThenBy(x => x.Semester); result.ScoreList = dataTemp.ToList(); return Success(result); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs index 4f59063b2..0ba103888 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs @@ -418,9 +418,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration return data; } - public IEnumerable GetStus(string academicYearNo, string semester) + public IEnumerable GetStus() { - var data = arrangeLessonTermService.GetStus(academicYearNo, semester); + var data = arrangeLessonTermService.GetStus(); return data; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs index 67155e902..65031b834 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs @@ -34,7 +34,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration IEnumerable GetTeachersNotRecord(string academicYearNo, string semester); IEnumerable GetClasses(); IEnumerable GetClassesNotRecord(string academicYearNo, string semester); - IEnumerable GetStus(string academicYearNo, string semester); + IEnumerable GetStus(); IEnumerable GetStusNotRecord(string academicYearNo, string semester); /// 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 332c2f032..1e06778e2 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 @@ -1701,14 +1701,14 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest } } - public IEnumerable GetStus(string academicYearNo, string semester) + public IEnumerable GetStus() { try { //var data = BaseRepository("CollegeMIS").FindList(@"select a.StuId,a.StuNo,a.DeptNo,a.MajorNo,a.Grade,a.ClassNo,a.StuName,a.GenderNo,a.Birthday,b.F_Password,b.F_Secretkey from dbo.StuInfoBasic a left join adms7ultimate2.dbo.LR_Base_User b on a.StuNo=b.F_EnCode where a.CheckMark='1'"); //根据学年学期判断排课同步数据表中是否有数据：若有，说明该学年学期同步过；若没有，修改基础表，false； - var aa = this.BaseRepository("CollegeMIS").FindEntity(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.STypeId == "8"); + var aa = this.BaseRepository("CollegeMIS").FindEntity(x => x.STypeId == "8"); if (aa == null) { this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoBasic set SyncFlag='false' "); @@ -1718,14 +1718,12 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest var db = BaseRepository("CollegeMIS"); var dbbase = BaseRepository(); db.BeginTrans(); - var data = db.FindList("select a.*,b.F_Password,b.F_Secretkey from dbo.StuInfoBasic a left join " + dbbase.getDbConnection().Database + ".dbo.LR_Base_User b on a.StuNo=b.F_EnCode where a.CheckMark=1 and a.StuId not in (select STableId from ArrangeLessonSync where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' )"); + var data = db.FindList("select a.*,b.F_Password,b.F_Secretkey from dbo.StuInfoBasic a left join " + dbbase.getDbConnection().Database + ".dbo.LR_Base_User b on a.StuNo=b.F_EnCode where a.CheckMark=1 and a.StuId not in (select STableId from ArrangeLessonSync )"); DateTime syncdate = DateTime.Now; foreach (var item in data.Select(m => m.StuId)) { ArrangeLessonSyncEntity alsEntity = new ArrangeLessonSyncEntity(); alsEntity.Create(); - alsEntity.AcademicYearNo = academicYearNo; - alsEntity.Semester = semester; alsEntity.STypeId = "8"; alsEntity.SDate = syncdate; alsEntity.STableId = item; @@ -2267,44 +2265,42 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les if (tablename == "CdDept") { //清空同步记录表 - db.ExecuteBySql("delete from ArrangeLessonSync where AcademicYearNo='" + - entity.AcademicYearNo + "' and Semester='" + entity.Semester + - "' and STypeId='2'"); + db.ExecuteBySql("delete from ArrangeLessonSync where STypeId='2'"); } if (tablename == "CdMajor") { //清空同步记录表 - db.ExecuteBySql("delete from ArrangeLessonSync where AcademicYearNo='" + - entity.AcademicYearNo + "' and Semester='" + entity.Semester + - "' and STypeId='3'"); + db.ExecuteBySql("delete from ArrangeLessonSync where STypeId='3'"); } if (tablename == "ClassInfo") { //清空同步记录表 - db.ExecuteBySql("delete from ArrangeLessonSync where AcademicYearNo='" + - entity.AcademicYearNo + "' and Semester='" + entity.Semester + - "' and STypeId='4'"); + db.ExecuteBySql("delete from ArrangeLessonSync where STypeId='4'"); } if (tablename == "ClassroomInfo") { //清空同步记录表 - db.ExecuteBySql("delete from ArrangeLessonSync where AcademicYearNo='" + - entity.AcademicYearNo + "' and Semester='" + entity.Semester + - "' and STypeId='6'"); + db.ExecuteBySql("delete from ArrangeLessonSync where STypeId='6'"); } if (tablename == "LessonInfo") { //清空同步记录表 - db.ExecuteBySql("delete from ArrangeLessonSync where AcademicYearNo='" + - entity.AcademicYearNo + "' and Semester='" + entity.Semester + - "' and STypeId='5'"); + db.ExecuteBySql("delete from ArrangeLessonSync where STypeId='5'"); } if (tablename == "EmpInfo") { //清空同步记录表 - db.ExecuteBySql("delete from ArrangeLessonSync where AcademicYearNo='" + - entity.AcademicYearNo + "' and Semester='" + entity.Semester + - "' and STypeId='7'"); + db.ExecuteBySql("delete from ArrangeLessonSync where STypeId='7'"); + } + if (tablename == "CdClassType") + { + //清空同步记录表 + db.ExecuteBySql("delete from ArrangeLessonSync where STypeId='9'"); + } + if (tablename == "LR_Base_Department") + { + //清空同步记录表 + db.ExecuteBySql("delete from ArrangeLessonSync where STypeId='10'"); } //重置基础数据表 db.ExecuteBySql("update " + tablename + " set SyncFlag=0"); @@ -2350,7 +2346,7 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les strSql.Append(" when b.jobrank in(1,2,3,4) then (case when ta.actcourses<=(" + weeks + "*b.weekcourses)/2 then ta.actcourses*b.feestandard else " + weeks + "*b.weekcourses*b.feestandard/2 end) "); strSql.Append(" else 0 end as actfeestandard "); strSql.Append("from "); - strSql.Append("(select count(*) as courses,a.empno,a.empname from ArrangeLessonTerm a where lessondate between '" + starttime + "' and '" + endtime + "' " + notimeSql + " group by a.empno,a.empname ) a "); + strSql.Append("(select count(*) as courses,a.empno,a.empname from ArrangeLessonTerm a where CheckMark=1 and lessondate between '" + starttime + "' and '" + endtime + "' " + notimeSql + " group by a.empno,a.empname ) a "); strSql.Append("left join (select count(*) as actcourses,EmpNo from (select ff.EmpNo,ff.LessonDate,ff.LessonTime from (select aall.* from (select EmpNo,ALTId from Teach_attendance where LessonSortNo='1' and clocktime between '" + starttime + "' and '" + endtime + "' " + notimeSql2 + " group by EmpNo,ALTId) ee left join ArrangeLessonTerm aall on aall.ALTId=ee.ALTId) ff group by ff.EmpNo,ff.LessonDate,ff.LessonTime) gg group by gg.EmpNo ) ta on ta.empno=a.empno "); strSql.Append("left join empinfo b on a.empno=b.empno "); strSql.Append("where a.empno is not null and (b.IsInActiveStatus=" + status + " or (0=" + status + " and b.IsInActiveStatus!=2)) "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index 1ac2201af..d042bc101 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -2262,7 +2262,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad if (!queryParam["StuNo"].IsEmpty()) { dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); - strSql.Append(" and s.StuNo=@StuNo "); + strSql.Append(" and (s.StuNo=@StuNo or s.StuName=@StuNo) "); } if (!queryParam["StuName"].IsEmpty()) { @@ -2402,7 +2402,7 @@ group by c.StuNo) cc where cc.StuNo = bb.StuNo) as RankIndept "); if (!queryParam["StuNo"].IsEmpty()) { dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); - strSql.Append(" and s.StuNo=@StuNo "); + strSql.Append(" and (s.StuNo=@StuNo OR s.StuName=@StuNo) "); } if (!queryParam["StuName"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue index f5834595c..22441d052 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue @@ -6,20 +6,12 @@ async onLaunch(param) { // 版本更新 - var newVer = '1.0.2'; + var newVer = '1.1.2'; var oldVer = localStorage.getItem('version');     if (newVer != oldVer) { localStorage.setItem('version', newVer); this.JUMP_TO("/") } - // 加载百度地图资源 - let ak = this.GET_AK() - var script = document.createElement('script'); - script.type = 'text/javascript'; - script.src = - 'https://api.map.baidu.com/api?v=1.0&type=webgl&ak=' + ak + - '&callback=' + 'initMap'; - document.head.appendChild(script); // 在App.vue文件中获取到页面到URL (初始化WXsdj) window.localStorage.setItem('scanUrl',location.href.split('#')[0]) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js index 1c6a0dccf..d4ebac60d 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js @@ -780,7 +780,7 @@ export default { //获取百度地图ak GET_AK() { - let ak = ['zdBn8ZVlAELEK3rsBsxin7cXaYxjT1uE','78iR1wqm8cER7Gjt4tT26HrGGtGuk9LI'] + let ak = ['mI6EMQ4uCYscEQ2DbnG8nMAhsm1OUwwT','mI6EMQ4uCYscEQ2DbnG8nMAhsm1OUwwT'] let current = this.GET_STORAGE('baiduAK') if(!current){ let ri = Math.floor(Math.random()*2); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/wxFn.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/wxFn.js index 35be97152..dfe25857b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/wxFn.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/wxFn.js @@ -1,12 +1,10 @@ +window.wx = null +window.wxInit = false import wx from '@/common/js/weixin-js-sdk.js'; +window.wx = wx // 参考文档 https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html export default { methods: { - data(){ - return { - wxInit:false - } - }, // 初始化wx initWx(arr = ["getLocation"]) { const promise = new Promise((resolve, reject) => { @@ -28,15 +26,28 @@ export default { signature: success.certificate, // 必填，签名 jsApiList: arr // 必填，需要使用的JS接口列表 }); + // 公众平台测试账号本地调试使用 + // console.log({nonceStr: success.noncestr,timestamp: success.timestamp,url}) + // wx.config({ + // debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 + // appId: 'wx2aa8dcf3603f77b5', // 必填，公众号的唯一标识 + // timestamp: '1719897639109', // 必填，生成签名的时间戳 + // nonceStr: "202407011704072775", // 必填，生成签名的随机串 + // signature: "af7666f9ed1355756b80561cf7b358fb603f7963", // 必填，签名 + // jsApiList: arr // 必填，需要使用的JS接口列表 + // }); wx.ready(() => { - this.wxInit = true - // this.TOAST("wx初始化成功") + window.wxInit = true resolve(true) }) - wx.error(() => { + wx.error((error) => { + // alert(JSON.stringify(error)) this.TOAST("wx初始化失败") resolve(false) }) + setTimeout(()=>{ + resolve("wx初始化超时") + },5000) }) }) return promise @@ -44,9 +55,10 @@ export default { // 获取定位 async getLocation() { return new Promise(async (resolve) => { - if (!this.wxInit) { + if (!window.wxInit) { let res = await this.initWx(["getLocation"]) - if(!res){ + if(!res||res=='wx初始化超时'){ + res&&this.TOAST(res) resolve(false) return } @@ -54,6 +66,7 @@ export default { if(!wx.getLocation){ this.TOAST("获取定位失败") resolve(false) + return } wx.getLocation({ type: "gcj02", // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02' @@ -68,6 +81,7 @@ export default { }) }, fail: (error) => { + // alert(JSON.stringify(error)) this.TOAST("获取定位失败！") resolve(false) } @@ -77,7 +91,7 @@ export default { // 拍照 async chooseImage() { return new Promise(async (resolve) => { - if (!this.wxInit) { + if (!window.wxInit) { let res = await this.initWx(["chooseImage"]) if(!res){ resolve(false) @@ -106,7 +120,7 @@ export default { // 预览图片 async previewImage(url,urlArr) { return new Promise(async (resolve) => { - if (!this.wxInit) { + if (!window.wxInit) { let res = await this.initWx(["previewImage"]) if(!res){ resolve(false) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 1a67a30e9..66516c689 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -2,7 +2,7 @@ export default { // 登录页显示的公司名称 "company": "数字化智慧校园", // App 版本号 - "appVersion": "1.0.0", + "appVersion": "1.1.2", // 是否允许用户注册 "enableSignUp": true, //请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json index be4296f28..b2e5827a2 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json @@ -2,7 +2,7 @@ "name" : "智慧校园", "appid" : "__UNI__7C24C09", "description" : "智慧校园移动端", - "versionName" : "2.2.0.240607", + "versionName" : "2.2.0.240705", "versionCode" : 20202, "transformPx" : false, /* 5+App特有相关 */ @@ -165,16 +165,24 @@ } }, "h5" : { - // "devServer": { - // "proxy" : { - // "/api" : { - // "target" : "http://192.168.10.58:8011/", //自己项目接口域名 - // "changeOrigin" : true, //是否跨域 - // // "secure" : true, // 设置支持https协议的代理 - // "pathRewrite": {"^/api":""} //api路径重定向，根据具体情况调整，也可不写 - // } - // } - // }, + "devServer" : { + "proxy" : { + // "/api" : { + // "target" : "http://192.168.10.58:8011/", //自己项目接口域名 + // "changeOrigin" : true, //是否跨域 + // // "secure" : true, // 设置支持https协议的代理 + // "pathRewrite": {"^/api":""} //api路径重定向，根据具体情况调整，也可不写 + // }, + "/baiduapi" : { + "target" : "https://api.map.baidu.com/", + "changeOrigin" : true, + "secure" : true, // 设置支持https协议的代理 + "pathRewrite" : { + "^/baiduapi" : "" + } //api路径重定向，根据具体情况调整，也可不写 + } + } + }, "uniStatistics" : { "enable" : false }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue index 5a85b4a54..8293bc8bf 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue @@ -40,7 +40,6 @@ -