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/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/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index ce8511d5b..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 @@ -2346,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/manifest.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json index e004d90f4..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特有相关 */