From 3bd678b3c9db82263e600ba7d92072dda37a0084 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 5 Jun 2024 11:12:55 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=20=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=9F=A5=E7=9C=8B=20=E5=8F=AA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=96=E6=B6=88=E7=AC=AC=E4=BA=8C=E6=AC=A1=E8=A1=A5?= =?UTF-8?q?=E8=80=83=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/AllStuScoreQueryIndex.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 485c6bcb7..a4d3195ae 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 @@ -129,8 +129,8 @@ var bootstrap = function ($, learun) { { label: '科目', name: 'LessonName', width: 300, align: "left" }, { label: '学分', name: 'StudyScore', width: 50, align: "left" }, { label: '成绩', name: 'Score', width: 100, align: "left" }, - { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, - { label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, + { label: '补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, + //{ label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, { label: '专业排名', name: 'RankInMajor', width: 100, align: "left" }, { label: '班级排名', name: 'RankInClass', width: 100, align: "left" }, ], From 98db350bc26435e5d5fb26e02ad31c3df5764084 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 3 Jun 2024 09:12:03 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=A0=A1=E5=8C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E4=B8=8D=E5=85=81=E8=AE=B8=E9=80=89=E8=87=AA?= =?UTF-8?q?=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Company/CompanyService.cs | 3 ++- .../Controllers/CompanyController.cs | 17 +++++++++++++++-- .../Views/Company/Form.cshtml | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs index ac26c1139..0ca9a1926 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs @@ -53,7 +53,8 @@ namespace Learun.Application.Organization t.F_Photo, t.F_BriefIntroduction, t.F_EnrollmentInformation, - t.F_ModifyUserName + t.F_ModifyUserName, + T.F_USCreditCode "; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs index e7baf2ceb..331a99b66 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs @@ -130,6 +130,11 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers list = list.Where(m => m.F_CompanyId != keyValue).ToList(); } + if (keyValue == entity.F_ParentId) + { + return Fail("操作失败,当前项不允许"); + } + if (list.Any(a => a.F_FullName == entity.F_FullName)) { return Fail("学校名称重复"); @@ -156,8 +161,16 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers [AjaxOnly] public ActionResult DeleteForm(string keyValue) { - companyIBLL.VirtualDelete(keyValue); - return Success("删除成功！", "公司信息", OperationType.Delete, keyValue, ""); + var list = companyIBLL.GetList().Where(x => x.F_ParentId == keyValue && x.F_EnabledMark == 1 && x.F_DeleteMark == 0); + if (list.Count() > 0) + { + return Fail("删除失败！拥有下辖项不可直接删除"); + } + else + { + companyIBLL.VirtualDelete(keyValue); + return Success("删除成功！", "公司信息", OperationType.Delete, keyValue, ""); + } } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml index 80801f5ea..d55398a13 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml @@ -36,7 +36,7 @@
电子邮箱
-
+
照片
From 08684151b7254c7c86beb1147c315e1139c76263 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 3 Jun 2024 09:15:39 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E4=B8=8D=E5=85=81=E8=AE=B8=E9=80=89=E8=87=AA?= =?UTF-8?q?=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DepartmentController.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs index 869c9f0c6..993f3d6b8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs @@ -17,6 +17,8 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers private DepartmentIBLL departmentIBLL = new DepartmentBLL(); private CompanyIBLL companyIBLL = new CompanyBLL(); + private static DepartmentIBLL departmentIBLL_static = new DepartmentBLL(); + private static Dictionary mapData = departmentIBLL_static.GetModelMap(); #region 获取视图 /// /// 主页 @@ -150,6 +152,10 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers return Fail("部门编号已存在！"); } } + if (keyValue == entity.F_ParentId) + { + return Fail("操作失败,当前项不允许"); + } //发送标识false entity.SendFlag = false; departmentIBLL.SaveEntity(keyValue, entity); @@ -164,8 +170,16 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers [AjaxOnly] public ActionResult DeleteForm(string keyValue) { - departmentIBLL.VirtualDelete(keyValue); - return Success("删除成功！"); + var list = departmentIBLL.GetAllList().Where(x => x.F_ParentId == keyValue); + if (list.Count() > 0) + { + return Fail("删除失败！拥有下辖项不可直接删除"); + } + else + { + departmentIBLL.VirtualDelete(keyValue); + return Success("删除成功！"); + } } #endregion } From f3e3ad546c4d30cfd1b5234db899632e0c90e024 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 5 Jun 2024 16:01:11 +0800 Subject: [PATCH 04/14] 1 --- .../LR_OrganizationModule/Controllers/DepartmentController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs index 993f3d6b8..2c30b0f98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/DepartmentController.cs @@ -1,5 +1,6 @@ using Learun.Application.Organization; using Learun.Util; +using System.Collections.Generic; using System.Linq; using System.Web.Mvc; From 749a501c24b2e8bc65d5bd17f54c2ef474790142 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 5 Jun 2024 16:54:20 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=A0=A1=E5=8C=BA=E6=95=B0=E6=8D=AE=20=E6=9C=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B1=9E=E6=80=A7=E7=99=BB=E5=BD=95=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Organization/Company/CompanyService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs index 0ca9a1926..ac26c1139 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs @@ -53,8 +53,7 @@ namespace Learun.Application.Organization t.F_Photo, t.F_BriefIntroduction, t.F_EnrollmentInformation, - t.F_ModifyUserName, - T.F_USCreditCode + t.F_ModifyUserName "; } #endregion From 741cc2dc35597ff89ed18e21908c9de510b88c4d Mon Sep 17 00:00:00 2001 From: yxq Date: Thu, 6 Jun 2024 15:22:41 +0800 Subject: [PATCH 06/14] =?UTF-8?q?web=20=E6=95=99=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E8=AF=BE=E6=97=B6=E8=B4=B9=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/coursestatictis.cshtml | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml index ec5af8777..3f14612e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml @@ -19,6 +19,94 @@
+
+
+
+ 时间段排除 + +
+ + + + +
+
+ 新增 +
+ + 确 定 + + +
+ + + + +
+
 查询
From 9187a89ea2158d99642bb0545f1531ac85518267 Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 13:38:01 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=89=93=E5=8D=A1=E5=A2=9E=E5=8A=A0wifi=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E6=A3=80=E6=B5=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/App.vue | 7 +++++ .../pages/AttendanceCard/list.vue | 25 +++++++++++++++++ .../pages/AttendanceCardTeacher/list.vue | 27 ++++++++++++++++++- .../LearunApp-2.2.0/vue.config.js | 2 +- 4 files changed, 59 insertions(+), 2 deletions(-) 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 f238cd635..a249f49e7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue @@ -5,6 +5,13 @@ // 考虑到用户刷新网页时会丢失全局数据、页面栈、页面数据等，因此直接跳回首页即可 async onLaunch(param) { + // 版本更新 + var newVer = '1.0.1'; + 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'); 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 beb459b69..0d036038d 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 @@ -31,6 +31,9 @@ {{postData.ClockPlace}} + + 定位不精准？WIFI信息打卡 + @@ -314,6 +317,19 @@ toAttendanceCardTeacher() { this.JUMP_TO('/pages/AttendanceCardTeacher/list', {},true) }, + // 判断是否学校网络 + isInternalNetwork(){ + this.LOADING() + this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ + this.HIDE_LOADING() + if(res.data&&['1.190.222.35','1.190.222.34'].inlcudes(res.data.client_ip)){ + let postData = {AIsOut:0,ClockPlace:'已连接校园网'} + this.NAV_TO(`./single_zc`,postData,true) + }else{ + this.TOAST('未检测到校园网连接') + } + }) + }, }, destroyed() { // let scirpt = document.getElementById('baiduScript') @@ -431,4 +447,13 @@ filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); filter: gray; } + + .wifiCard{ + margin-top: 6px; + font-size: 14px; + text-align: center; + span{ + color: #0c86d8; + } + } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue index ec63c89dd..af586e192 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue @@ -40,6 +40,9 @@ {{postData.ClockPlace}} + + 定位不精准？WIFI信息打卡 + @@ -312,7 +315,20 @@ }) }); - } + }, + // 判断是否学校网络 + isInternalNetwork(){ + this.LOADING() + this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ + this.HIDE_LOADING() + if(res.data&&['1.190.222.35','1.190.222.34'].inlcudes(res.data.client_ip)){ + let postData = {AIsOut:0,ClockPlace:'已连接校园网'} + this.NAV_TO(`./single_zc`,postData,true) + }else{ + this.TOAST('未检测到校园网连接') + } + }) + }, }, destroyed() { let scirpt = document.getElementById('baiduScript') @@ -430,4 +446,13 @@ filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); filter: gray; } + + .wifiCard{ + margin-top: 6px; + font-size: 14px; + text-align: center; + span{ + color: #0c86d8; + } + } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js index aec61525d..0f155ed26 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js @@ -14,7 +14,7 @@ module.exports = { disableHostCheck: true }, output: { // 输出重构 打包编译后的 文件目录 文件名称 【模块名称.时间戳】 - filename: `${filePath}[name]${Timestamp}.js`, + filename: `${filePath}[name]${Timestamp}.js?v=1.0.1`, chunkFilename: `${filePath}[name]${Timestamp}.js` }, } From 34f4b1254ad0807fa4e700a963bb52a26b87740b Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 15:23:27 +0800 Subject: [PATCH 08/14] =?UTF-8?q?web=20=E8=AF=BE=E6=97=B6=E8=B4=B9?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4=E6=AE=B5=E6=8E=92=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/coursestatictis.cshtml | 93 ++++++++++--------- .../ArrangeLessonTerm/coursestatictis.js | 4 + 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml index 3f14612e8..65b914a5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.cshtml @@ -10,19 +10,13 @@
-
-
-
-
-
-
-
-
-
+ + +
- 新增 + 新 增
- 确 定 + 确 定
- - -
+
+
+
+
+
+
+
+
+
 查询
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js index 8009affaa..13a05ad8f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/coursestatictis.js @@ -53,8 +53,11 @@ var bootstrap = function ($, learun) { // 默认 dfvalue: '0', selectfn: function (begin, end) { + $('#datesearch').attr('starttime', begin) + $('#datesearch').attr('endtime', end) startTime = begin; endTime = end; + window.datesearchChange() } }); // 查询 @@ -166,6 +169,7 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = startTime; param.EndTime = endTime; + param.noTime = $('#timeNoCludes').attr("timeNoCludes") $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; From 545990c78557c56dd9f49ddaf8e5141fc9bde50c Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 15:25:01 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=89=93=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/AttendanceCard/list.vue | 15 ++++++++++----- .../pages/AttendanceCardTeacher/list.vue | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) 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 0d036038d..9ee1afd5c 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 @@ -31,7 +31,7 @@ {{postData.ClockPlace}} - + 定位不精准？WIFI信息打卡 @@ -96,6 +96,8 @@ postData: {}, isGetingLocal:false, // modal:false, + + isInternalNet:false, } }, @@ -106,6 +108,7 @@ methods: { // 页面初始化 async init() { + this.isInternalNetwork(false) this.LOADING('加载数据中...') this.now = this.getCurrentTime() @@ -318,15 +321,17 @@ this.JUMP_TO('/pages/AttendanceCardTeacher/list', {},true) }, // 判断是否学校网络 - isInternalNetwork(){ + isInternalNetwork(TOAST=true){ this.LOADING() this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ this.HIDE_LOADING() - if(res.data&&['1.190.222.35','1.190.222.34'].inlcudes(res.data.client_ip)){ + let res_ = res[1] + if(res_.data&&['1.190.222.35','1.190.222.34','1.190.222.40'].includes(res_.data.client_ip)){ + this.isInternalNet = true let postData = {AIsOut:0,ClockPlace:'已连接校园网'} - this.NAV_TO(`./single_zc`,postData,true) + TOAST&&this.NAV_TO(`./single_zc`,postData,true) }else{ - this.TOAST('未检测到校园网连接') + TOAST&&this.TOAST('未检测到校园网连接') } }) }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue index af586e192..5cfa13e06 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue @@ -40,7 +40,7 @@ {{postData.ClockPlace}} - + 定位不精准？WIFI信息打卡 @@ -100,6 +100,8 @@ map: null, postData: {}, isGetingLocal:false, + + isInternalNet:false, } }, @@ -110,6 +112,7 @@ methods: { // 页面初始化 async init() { + this.isInternalNetwork(false) this.LOADING('加载数据中...') this.now = this.getCurrentTime() @@ -317,15 +320,17 @@ }); }, // 判断是否学校网络 - isInternalNetwork(){ + isInternalNetwork(TOAST=true){ this.LOADING() this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ this.HIDE_LOADING() - if(res.data&&['1.190.222.35','1.190.222.34'].inlcudes(res.data.client_ip)){ + let res_ = res[1] + if(res_.data&&['1.190.222.35','1.190.222.34','1.190.222.40'].includes(res_.data.client_ip)){ + this.isInternalNet = true let postData = {AIsOut:0,ClockPlace:'已连接校园网'} - this.NAV_TO(`./single_zc`,postData,true) + TOAST&&this.NAV_TO(`./single_zc`,postData,true) }else{ - this.TOAST('未检测到校园网连接') + TOAST&&this.TOAST('未检测到校园网连接') } }) }, From 843d793803025454556e83a138ab79f9579493fc Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 16:29:05 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=89=93=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/AttendanceCard/list.vue | 7 ++++++- .../LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) 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 9ee1afd5c..d793e5d1b 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 @@ -326,7 +326,12 @@ this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ this.HIDE_LOADING() let res_ = res[1] - if(res_.data&&['1.190.222.35','1.190.222.34','1.190.222.40'].includes(res_.data.client_ip)){ + let client_ip_start = '1.190.222.' + let arr = [] + for(let i=34;i<47;i++){ + arr.push(client_ip_start+i) + } + if(res_.data&&arr.includes(res_.data.client_ip)){ this.isInternalNet = true let postData = {AIsOut:0,ClockPlace:'已连接校园网'} TOAST&&this.NAV_TO(`./single_zc`,postData,true) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue index 5cfa13e06..8c3419e9b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCardTeacher/list.vue @@ -325,7 +325,12 @@ this.requestBase("https://mp.weixin.qq.com/intp/getuserclientip").then(res=>{ this.HIDE_LOADING() let res_ = res[1] - if(res_.data&&['1.190.222.35','1.190.222.34','1.190.222.40'].includes(res_.data.client_ip)){ + let client_ip_start = '1.190.222.' + let arr = [] + for(let i=34;i<47;i++){ + arr.push(client_ip_start+i) + } + if(res_.data&&arr.includes(res_.data.client_ip)){ this.isInternalNet = true let postData = {AIsOut:0,ClockPlace:'已连接校园网'} TOAST&&this.NAV_TO(`./single_zc`,postData,true) From a9ebdeeba872e0f26ba1502dd6388f21e8448649 Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 7 Jun 2024 16:30:21 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue | 2 +- Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a249f49e7..f5834595c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue @@ -6,7 +6,7 @@ async onLaunch(param) { // 版本更新 - var newVer = '1.0.1'; + var newVer = '1.0.2'; var oldVer = localStorage.getItem('version');     if (newVer != oldVer) { localStorage.setItem('version', newVer); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js index 0f155ed26..5e1d367f9 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/vue.config.js @@ -14,7 +14,7 @@ module.exports = { disableHostCheck: true }, output: { // 输出重构 打包编译后的 文件目录 文件名称 【模块名称.时间戳】 - filename: `${filePath}[name]${Timestamp}.js?v=1.0.1`, + filename: `${filePath}[name]${Timestamp}.js?v=1.0.2`, chunkFilename: `${filePath}[name]${Timestamp}.js` }, } From 6b192ed040859dc44557fe4060abf3a7a619f3fc Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 11 Jun 2024 09:19:24 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E6=B7=BB=E5=8A=A0=E4=B8=AD=E9=AB=98?= =?UTF-8?q?=E8=81=8C=E5=8C=BA=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/OpenLessonPlan/Index.cshtml | 4 ++++ .../EducationalAdministration/Views/OpenLessonPlan/Index.js | 5 +++++ .../Areas/LR_OrganizationModule/Views/Company/Form.cshtml | 2 +- .../OpenLessonPlan/OpenLessonPlanService.cs | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlan/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlan/Index.cshtml index 8d7c8ab46..8db03bccb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlan/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlan/Index.cshtml @@ -30,6 +30,10 @@
系部
+
+
高/中职
+
+
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlan/Index.js index 28d3949a4..9fdde9882 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlan/Index.js @@ -17,6 +17,11 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 360, 400); + $('#GZ').lrselect({ + data: [{ text: "高职", value: "G" }, { text: "中职", value: "Z" }], + text: "text", + value: "value" + }) // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml index d55398a13..80801f5ea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml @@ -36,7 +36,7 @@
电子邮箱
-
+
照片
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanService.cs index c91399324..ddeda7a9e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanService.cs @@ -95,6 +95,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("LessonName", "%" + queryParam["LessonName"].ToString() + "%", DbType.String); strSql.Append(" AND t.LessonName Like @LessonName "); } + if (!queryParam["GZ"].IsEmpty()) + { + dp.Add("GZ", queryParam["GZ"].ToString() + "%", DbType.String); + strSql.Append(" AND t.MajorNo Like @GZ "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) From 6f46d965ef6c16efe67c8124bc5a5ea7fbadd233 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 11 Jun 2024 14:35:14 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E3=80=81=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=8E=92?= =?UTF-8?q?=E5=90=8D=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BB=BB=E6=84=8F=E7=BB=84?= =?UTF-8?q?=E5=90=88=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuScoreController.cs | 20 ++++ .../Views/StuScore/AllStuScoreQueryIndex.js | 20 ++-- .../Views/StuScore/StuScoreRank.js | 14 +-- .../StuScore/StuScoreBLL.cs | 23 +++++ .../StuScore/StuScoreIBLL.cs | 6 ++ .../StuScore/StuScoreService.cs | 96 ++++++++++++++++++- 6 files changed, 159 insertions(+), 20 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index 57f9e7417..322bb0e19 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -863,6 +863,26 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return Success(data); } + /// + /// 全院学生成绩查看 + /// + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetScorePageListByStuInfo(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = stuScoreIBLL.GetScorePageListByStuInfo(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } /// /// 学生成绩排名 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 a4d3195ae..da47d6748 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 @@ -22,10 +22,10 @@ var bootstrap = function ($, learun) { p.StuNo = $.trim($('#StuNo').val()); p.LessonNo = $.trim($('#LessonNo').lrselectGet()); p.Grade = $.trim($('#Grade').lrselectGet()); - if (p.StuNo == null || p.StuNo == "") { - learun.alert.warning("请输入学号！"); - return; - } + //if (p.StuNo == null || p.StuNo == "") { + // learun.alert.warning("请输入学号！"); + // return; + //} page.initGird(); page.search(p); @@ -115,13 +115,13 @@ var bootstrap = function ($, learun) { }, initGird: function () { $('#gridtable').lrAuthorizeJfGridLei({ - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuInfo', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScorePageListByStuInfo', headData: [ { label: '学号', name: 'StuNo', width: 100, align: "left" }, { label: '姓名', name: 'StuName', width: 200, align: "left" }, - { label: '专业', name: 'MajorName', width: 100, align: "left" }, - { label: '班级', name: 'ClassName', width: 100, align: "left" }, - { label: '年级', name: 'AcademicYearNo', width: 50, align: "left" }, + { label: '专业', name: 'MajorName', width: 150, align: "left" }, + { label: '班级', name: 'ClassName', width: 130, align: "left" }, + { label: '年级', name: 'Grade', width: 50, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, { label: '学期', name: 'Semester', width: 50, align: "left" }, { label: '课程分类', name: 'LessonSortName', width: 60, align: "left" }, @@ -135,8 +135,8 @@ var bootstrap = function ($, learun) { { label: '班级排名', name: 'RankInClass', width: 100, align: "left" }, ], mainId: 'StuNo', - isPage: false, - sidx: '', + isPage: true, + sidx: 'AcademicYearNo desc,Semester desc,Grade desc,MajorNo,ClassNo,StuNo,LessonSortNo,LessonNo', sord: '', onRenderComplete: function (data) { var studyscoreall = 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/StuScoreRank.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/StuScoreRank.js index 7576ef0c9..662514b47 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/StuScoreRank.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/StuScoreRank.js @@ -20,10 +20,10 @@ var bootstrap = function ($, learun) { p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); p.Semester = $('#Semester').lrselectGet(); p.StuNo = $.trim($('#StuNo').val()); - if (p.StuNo == null || p.StuNo == "") { - learun.alert.warning("请输入学号！"); - return; - } + //if (p.StuNo == null || p.StuNo == "") { + // learun.alert.warning("请输入学号！"); + // return; + //} page.initGird(); page.search(p); @@ -71,7 +71,7 @@ var bootstrap = function ($, learun) { }, initGird: function () { $('#gridtable').lrAuthorizeJfGridLei({ - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListRank', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScorePageListByStuInfo', headData: [ { label: '学号', name: 'StuNo', width: 100, align: "left" }, { label: '姓名', name: 'StuName', width: 200, align: "left" }, @@ -91,8 +91,8 @@ var bootstrap = function ($, learun) { { label: '系排名', name: 'RankIndept', width: 100, align: "left" }, ], mainId: 'StuNo', - isPage: false, - sidx: '', + isPage: true, + sidx: 'AcademicYearNo desc,Semester desc,Grade desc,MajorNo,ClassNo,StuNo,LessonSortNo,LessonNo', sord: '', onRenderComplete: function (data) { var studyscoreall = 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs index c16fe6a98..406d00238 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs @@ -781,6 +781,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + /// + /// 根据学号/姓名获取学生成绩列表，带分页 + /// + /// + /// + public IEnumerable GetScorePageListByStuInfo(Pagination pagination, string queryJson) + { + try + { + return stuScoreService.GetScorePageListByStuInfo(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 根据学号/姓名获取学生成绩列表 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs index 3df3a154c..134a5241f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs @@ -191,6 +191,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetScoreListByStuInfo(string queryJson); + /// + /// 根据学号/姓名获取学生成绩列表，带分页 + /// + /// + /// + IEnumerable GetScorePageListByStuInfo(Pagination pagination, string queryJson); /// /// 根据学号/姓名获取学生成绩列表 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 a59bf0680..03c5388aa 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 @@ -2245,7 +2245,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad tableName = queryParam["TableName"].ToString(); } var strSql = new StringBuilder(); - strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,li.StudyScore,ls.LessonSortName,lt.LessonTypeName,bb.Score,(case when sp.Score>=60 then 60 else sp.score end) as ScoreOfNotPass,(case when spt.Score>=60 then 60 else spt.Score end) as ScoreOfNotPassTwo,cm.MajorName,ci.ClassName "); + strSql.Append(" select bb.Grade,bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,li.StudyScore,ls.LessonSortName,lt.LessonTypeName,bb.Score,(case when sp.Score>=60 then 60 else sp.score end) as ScoreOfNotPass,(case when spt.Score>=60 then 60 else spt.Score end) as ScoreOfNotPassTwo,cm.MajorName,ci.ClassName "); strSql.Append(" from ( "); strSql.Append($"select sb.Grade,s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); strSql.Append(" where 1=1 and s.CheckMark='1' "); @@ -2354,6 +2354,96 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad } } + /// + /// 根据学号/姓名获取学生成绩列表，带分页 + /// + /// + /// + public IEnumerable GetScorePageListByStuInfo(Pagination pagination, string queryJson) + { + try + { + //参考写法 + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var tableName = "StuScore"; + if (!queryParam["TableName"].IsEmpty()) + { + tableName = queryParam["TableName"].ToString(); + } + var strSql = new StringBuilder(); + strSql.Append(" select bb.Grade,bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,bb.DeptNo,li.StudyScore,ls.LessonSortName,lt.LessonTypeName,bb.Score,(case when sp.Score>=60 then 60 else sp.score end) as ScoreOfNotPass,(case when spt.Score>=60 then 60 else spt.Score end) as ScoreOfNotPassTwo,cm.MajorName,ci.ClassName "); + strSql.Append(@" ,(select cc.majorrank from +(select StuNo, SUM(Score) as totalscore, ROW_NUMBER() over(order by SUM(Score) desc) as majorrank +from StuScore c where c.CheckMark = '1' and c.LessonSortNo = '1' and c.MajorNo = bb.MajorNo and c.AcademicYearNo = bb.AcademicYearNo and c.Semester = bb.Semester +group by c.StuNo) cc where cc.StuNo = bb.StuNo) as RankInMajor "); + strSql.Append(@" ,(select cc.majorrank from +(select StuNo, SUM(Score) as totalscore, ROW_NUMBER() over(order by SUM(Score) desc) as majorrank +from StuScore c where c.CheckMark = '1' and c.LessonSortNo = '1' and c.ClassNo = bb.ClassNo and c.AcademicYearNo = bb.AcademicYearNo and c.Semester = bb.Semester +group by c.StuNo) cc where cc.StuNo = bb.StuNo) as RankInClass "); + strSql.Append(@" ,(select cc.majorrank from +(select StuNo, SUM(Score) as totalscore, ROW_NUMBER() over(order by SUM(Score) desc) as majorrank +from StuScore c where c.CheckMark = '1' and c.LessonSortNo = '1' and c.DeptNo = bb.DeptNo and c.AcademicYearNo = bb.AcademicYearNo and c.Semester = bb.Semester +group by c.StuNo) cc where cc.StuNo = bb.StuNo) as RankIndept "); + strSql.Append(" from ( "); + strSql.Append($"select sb.Grade,s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,s.DeptNo,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); + strSql.Append(" where 1=1 and s.CheckMark='1' "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" and s.AcademicYearNo=@AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" and s.Semester=@Semester "); + } + if (!queryParam["StuNo"].IsEmpty()) + { + dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); + strSql.Append(" and s.StuNo=@StuNo "); + } + if (!queryParam["StuName"].IsEmpty()) + { + dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String); + strSql.Append(" and s.StuName=@StuName "); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String); + strSql.Append(" and s.LessonNo=@LessonNo "); + } + if (!queryParam["Grade"].IsEmpty()) + { + dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String); + strSql.Append(" and sb.Grade=@Grade "); + } + strSql.Append(" group by sb.Grade,s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,s.DeptNo ) as bb "); + strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' "); + strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' "); + strSql.Append(" left join CdLessonSort ls on bb.LessonSortNo= ls.LessonSortNo "); + strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo and li.CheckMark='1' "); + strSql.Append(" left join CdMajor cm on bb.MajorNo= cm.MajorNo and cm.CheckMark='1' "); + strSql.Append(" left join ClassInfo ci on bb.ClassNo= ci.ClassNo and ci.CheckMark='1' "); + strSql.Append(" left join CdLessonType lt on li.LessonTypeId=lt.ltid and lt.LTEnabled='1' "); + + var result = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 根据学号/姓名获取学生成绩列表 @@ -2909,13 +2999,13 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad var kclx = queryParam["LessonType"].ToString(); sql = sql + $" and d.LTId='{kclx}' "; } - var ls = this.BaseRepository("CollegeMIS").FindList(sql).GroupBy(x => new { x.ClassNo, x.LessonNo }).Select(x => new StuScoreEntity { ClassNo = x.Key.ClassNo, LessonNo = x.Key.LessonNo, LessonName = x.FirstOrDefault().LessonName, AcademicYearNo = x.FirstOrDefault().AcademicYearNo, Semester = x.FirstOrDefault().Semester, DeptNo = x.FirstOrDefault().DeptNo, Grade = x.FirstOrDefault().Grade, LessonTypeName = x.FirstOrDefault().LessonTypeName, EmpName = x.FirstOrDefault().EmpName, EmpNo = x.FirstOrDefault().EmpNo, ModifyUserId = x.FirstOrDefault().ModifyUserId, ModifyUserName = x.FirstOrDefault().ModifyUserName, LessonTypeId=x.FirstOrDefault().LessonTypeId,ScoreId=x.FirstOrDefault().ScoreId, CheckMark = x.All(a => a.CheckMark == "1") ? "1" : "0" }); + var ls = this.BaseRepository("CollegeMIS").FindList(sql).GroupBy(x => new { x.ClassNo, x.LessonNo }).Select(x => new StuScoreEntity { ClassNo = x.Key.ClassNo, LessonNo = x.Key.LessonNo, LessonName = x.FirstOrDefault().LessonName, AcademicYearNo = x.FirstOrDefault().AcademicYearNo, Semester = x.FirstOrDefault().Semester, DeptNo = x.FirstOrDefault().DeptNo, Grade = x.FirstOrDefault().Grade, LessonTypeName = x.FirstOrDefault().LessonTypeName, EmpName = x.FirstOrDefault().EmpName, EmpNo = x.FirstOrDefault().EmpNo, ModifyUserId = x.FirstOrDefault().ModifyUserId, ModifyUserName = x.FirstOrDefault().ModifyUserName, LessonTypeId = x.FirstOrDefault().LessonTypeId, ScoreId = x.FirstOrDefault().ScoreId, CheckMark = x.All(a => a.CheckMark == "1") ? "1" : "0" }); if (!queryParam["Stat"].IsEmpty()) { var zt = queryParam["Stat"].ToString(); - ls=ls.Where(x=>x.CheckMark==zt); + ls = ls.Where(x => x.CheckMark == zt); } From 769fe0cbcafa223baa2c1e596ad3f385f1bb1837 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 12 Jun 2024 14:56:12 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E8=AF=BE=E6=97=B6=E8=B4=B9=E7=BB=9F=E8=AE=A1=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E6=AE=B5=E6=8E=92=E9=99=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermService.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 ec04aa511..6400be4e8 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 @@ -2274,15 +2274,26 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les var status = (queryParam["status"] == null ? "0" : queryParam["status"].ToString()).ToInt(); string starttime = queryParam["StartTime"].IsEmpty() ? DateTime.Now.Date.ToString() : queryParam["StartTime"].ToString(); string endtime = queryParam["EndTime"].IsEmpty() ? DateTime.Now.Date.ToString() : queryParam["EndTime"].ToString(); + var notimeSql = string.Empty; + var notimeSql2 = string.Empty; + if (!queryParam["noTime"].IsEmpty()) + { + foreach (var item in queryParam["noTime"].ToString().Split('&')) + { + notimeSql += $" and lessondate not between '{item.Split(',')[0]}' and '{item.Split(',')[1]}'"; + notimeSql2 += $" and clocktime not between '{item.Split(',')[0]}' and '{item.Split(',')[1]}'"; + } + } + strSql.Append("select a.*,b.jobrank as zhiwu,b.ProfessionalTitle as zhicheng,b.F_DepartmentId as dept,b.feestandard,b.Weekcourses,ta.actcourses as monthactcourses,ta.actcourses-(" + weeks + "*b.Weekcourses) as zhesuan_monthactcourses, "); strSql.Append(" case when ta.actcourses is null then 0 when b.jobrank in(5,6) then (ta.actcourses-" + weeks + "*b.Weekcourses)*b.feestandard "); 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 + "' 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 + "' 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("(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("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)) "); + strSql.Append("where a.empno is not null and (b.IsInActiveStatus=" + status + " or (0=" + status + " and b.IsInActiveStatus!=2)) "); if (!string.IsNullOrEmpty(deptNo)) { strSql.Append("and b.F_DepartmentId='" + deptNo + "' ");