From eac5408eb1dfc0f4ef901ce1794904e98672e189 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 24 Jun 2022 17:54:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E6=95=99=E7=AE=A1=E7=90=86--=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E8=AF=84=E6=95=99=E6=83=85=E5=86=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=AF=84=E6=95=99=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Eval_Main/AnswerIndex.cshtml | 7 ++++++- .../Views/Eval_Main/AnswerIndex.js | 21 ++++++++++++------- .../Eval_Main/Eval_MainService.cs | 13 ++++++++++++ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.cshtml index 05af0fb64..ab5c047a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.cshtml @@ -26,6 +26,10 @@
课程
+
+
是否评教
+
+
@@ -36,10 +40,11 @@
 查看答卷 +
-
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js index 8b43eb791..866dbf297 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/AnswerIndex.js @@ -19,6 +19,12 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#IsEval').lrselect({ + placeholder: "请选择是否评教", + data: [{ text: "是", value: "1" }, { text: "否", value: "2" }], + text: "text", + value: "value" + }); $('#EmpNo').lrselect({ placeholder: "请选择教师", allowSearch: true, @@ -39,13 +45,13 @@ var bootstrap = function ($, learun) { }); // 答题情况 $('#lr_view').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('VID'); + var keyValue = $('#gridtable_stu').jfGridValue('VID'); if (learun.checkrow(keyValue)) { - var Status = $('#gridtable').jfGridValue('UID'); + var Status = $('#gridtable_stu').jfGridValue('UID'); if (Status != undefined && Status !== '') { - var StuNo = $('#gridtable').jfGridValue('StuNo'); - var EmpNo = $('#gridtable').jfGridValue('EmpNo'); - var LessonNo = $('#gridtable').jfGridValue('LessonNo'); + var StuNo = $('#gridtable_stu').jfGridValue('StuNo'); + var EmpNo = $('#gridtable_stu').jfGridValue('EmpNo'); + var LessonNo = $('#gridtable_stu').jfGridValue('LessonNo'); learun.layerForm({ id: 'EvaluationTeachpaper' + keyValue, title: '评教答卷', @@ -60,10 +66,11 @@ var bootstrap = function ($, learun) { } } }); + }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGridLei({ + $('#gridtable_stu').lrAuthorizeJfGridLei({ url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/GetAnswerPageList', headData: [ { label: "姓名", name: "StuName", width: 80, align: "left" }, @@ -134,7 +141,7 @@ var bootstrap = function ($, learun) { if (!!pLessonNo) { param.LessonNo = pLessonNo; } - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + $('#gridtable_stu').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs index 80f8c6c82..90d3a1151 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs @@ -399,6 +399,19 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach strSql.Append(" AND aa.LessonNo in (" + queryParam["LessonNo"].ToString() + ") "); } } + + if (!queryParam["IsEval"].IsEmpty()) + { + if (queryParam["IsEval"].ToString() == "1") + { + strSql.Append(" and bb.UID is not null and len(bb.UID)>0"); + } + else if (queryParam["IsEval"].ToString() == "2") + { + strSql.Append(" and (bb.UID is null or len(bb.UID)=0)"); + } + } + return this.BaseRepository().FindList(strSql.ToString(), dp, paginationobj); } catch (Exception ex)