From 808cf710077c5b4a6a3d5b02cf038e134234de36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E5=AF=92?= <823756726@qq.com> Date: Fri, 10 Jan 2025 17:34:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E2=80=9D=E8=80=83=E6=A0=B8=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E2=80=9C=E5=AD=97=E6=AE=B5=20=E5=85=A8=E9=99=A2?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=9A=E8=80=83=E8=AF=95=E8=AF=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=88=86=E6=95=B0=EF=BC=8C=E8=80=83=E5=AF=9F=E8=AF=BE=E6=98=BE?= =?UTF-8?q?=E7=A4=BAA=20B=20C=20D=E5=9B=9B=E4=B8=AA=E7=AD=89=E7=BA=A7=20?= =?UTF-8?q?=E8=AF=84=E6=95=99=E7=AE=A1=E7=90=86=E4=B8=8D=E6=BB=A1=E6=84=8F?= =?UTF-8?q?=E7=9A=84=E7=AD=94=E6=A1=88=E5=86=85=E5=AE=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E6=95=99=E5=B8=88=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9C=80=E8=A6=81=E5=85=B3=E9=97=AD=20?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=9A=84=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=85=B6=E4=BB=96=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/EmpInfoEnternalController.cs | 25 +++++++---- .../Views/LessonInfo/Form.cshtml | 8 +++- .../Views/LessonInfo/Form.js | 1 + .../Views/LessonInfo/Index.js | 24 ++++++++++ .../Views/StuInfoBasic/Form.cshtml | 36 +++++++-------- .../Views/StuScore/AllStuScoreQueryIndex.js | 21 ++++++++- .../Controllers/Eval_MainController.cs | 8 +++- .../Views/Eval_Main/Index.cshtml | 1 + .../EvaluationTeach/Views/Eval_Main/Index.js | 7 +++ .../LessonInfo/LessonInfoEntity.cs | 5 +++ .../StuScore/StuScoreService.cs | 3 +- .../EvaluationTeach/Eval_Main/Eval_MainBLL.cs | 44 +++++++++++++++++++ .../Eval_Main/Eval_MainIBLL.cs | 4 ++ .../Eval_Main/Eval_MainService.cs | 35 +++++++++++++-- 14 files changed, 187 insertions(+), 35 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs index 8e074013e..23b05880e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs @@ -19,6 +19,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers UserIBLL userIBLL = new UserBLL(); EmpInfoIBLL empInfoIBLL = new EmpInfoBLL(); AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL(); + private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL(); public ActionResult FormAdd() { return View(); @@ -116,19 +117,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult SaveForm(string keyValue, string strEntity) { - EmpInfoEntity entity = strEntity.ToObject(); - if (!string.IsNullOrEmpty(entity.EmpNo)) + var result = teachSwitchIBLL.FindFirst("js"); + if (result) { - var empentity = empInfoIBLL.GetEmpInfoEntityByEmpNo(entity.EmpNo); - var userEntity = userIBLL.GetEntityByAccount(entity.EmpNo); - if (null != empentity || null != userEntity) + EmpInfoEntity entity = strEntity.ToObject(); + if (!string.IsNullOrEmpty(entity.EmpNo)) { - return Success(new { data = entity, info = "有重复的职工编号" }); + var empentity = empInfoIBLL.GetEmpInfoEntityByEmpNo(entity.EmpNo); + var userEntity = userIBLL.GetEntityByAccount(entity.EmpNo); + if (null != empentity || null != userEntity) + { + return Success(new { data = entity, info = "有重复的职工编号" }); + } } + entity.EmpId = Guid.NewGuid().ToString(); + empInfoIBLL.SaveEntity(keyValue, entity); + return Success(new { data = entity, info = "保存成功" }); } - entity.EmpId = Guid.NewGuid().ToString(); - empInfoIBLL.SaveEntity(keyValue, entity); - return Success(new { data = entity, info = "保存成功" }); + return Success("教师注册功能已关闭"); + } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml index c56d7affb..1209bef19 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml @@ -63,11 +63,15 @@
修读对象
-
+
+
考核方式*
+
+
+
课程分类*
-
+
课程分类明细
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js index 169d4781a..bc710a2ff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.js @@ -51,6 +51,7 @@ var bootstrap = function ($, learun) { } }); $('#HaveBeforeLesson').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#AssessmentMethodNo').lrDataItemSelect({ code: 'AssessmentMethod' }); $('#BeforeLesson').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' }); $('#WhoStudy').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' }); $('#LessonSortNo').lrDataSourceSelect({ code: 'CdLessonSort', value: 'lessonsortno', text: 'lessonsortname' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js index fa811388b..76551eba3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Index.js @@ -222,6 +222,18 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "考核方式", name: "AssessmentMethodNo", width: 120, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AssessmentMethod', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: "课程分类", name: "LessonSortNo", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -307,7 +319,19 @@ var bootstrap = function ($, learun) { } }); } + }, { + label: "考核方式", name: "AssessmentMethodNo", width: 120, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'AssessmentMethod', + callback: function (_data) { + callback(_data.text); + } + }); + } }, + { label: "课程分类", name: "LessonSortNo", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index 603539df8..16fd493c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -16,12 +16,12 @@
-
考生号*
- +
考生号
+
-
通知书号*
- +
通知书号
+
身份证号*
@@ -48,8 +48,8 @@
-
出生日期*
- +
出生日期
+
健康状况
@@ -80,24 +80,24 @@
-
开户银行*
-
+
开户银行
+
-
开户卡账号*
- +
开户卡账号
+
开户银行位置
-
通信地址*
- +
通信地址
+
-
邮政编码*
- +
邮政编码
+
户口所在地
@@ -176,8 +176,8 @@
-
报到日期*
- +
报到日期
+
学习形式
@@ -208,8 +208,8 @@
-
入学年月*
- +
入学年月
+
入党时间
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 4df54862a..5b69f9aca 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 @@ -82,7 +82,26 @@ var bootstrap = function ($, learun) { { label: '科目类型', name: 'LessonSortName', width: 60, align: "left" }, { label: '科目', name: 'LessonName', width: 300, align: "left" }, { label: '学分', name: 'StudyScore', width: 50, align: "left" }, - { label: '成绩', name: 'Score', width: 100, align: "left" }, + { + label: '成绩', name: 'Score', width: 100, align: "left", + formatter: function (value, row) { + if (row.ExamType ==="1") { + return value; + } else { + if (value >= 80 && value <= 100) { + return 'A'; + } else if (value >= 60 && value < 80) { + return 'B'; + } else if (value >= 40 && value < 60) { + return 'C'; + } else if (value >= 0 && value < 40) { + return 'D'; + } else { + return '无效分数'; // 处理无效分数 + } + } + } + }, { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, { label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, { label: '专业排名', name: 'RankInMajor', width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs index e32da9760..3747bd1cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using Learun.Application.TwoDevelopment.EducationalAdministration; using Learun.Application.TwoDevelopment.EvaluationTeach; using System.Linq; +using Learun.Application.Organization; namespace Learun.Application.Web.Areas.EvaluationTeach.Controllers { @@ -185,7 +186,12 @@ namespace Learun.Application.Web.Areas.EvaluationTeach.Controllers var data = ask_MainIBLL.GetTeacherIndexPageList2(null, queryJson); return Success(data); } - + [HttpGet] + public ActionResult GetDissatisfiedExport(string keyValue) + { + ask_MainIBLL.GetExportList(keyValue); + return Success("导出成功。"); + } [HttpGet] [AjaxOnly] public ActionResult GetTeacherIndexPageList2(string pagination, string queryJson) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml index d45940a7a..ba2608c98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml @@ -35,6 +35,7 @@  教师被评情况  教师被评情况2  查看问卷 +  不满意结果导出
  审核 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js index c419fb78e..8f65b52e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js @@ -54,6 +54,13 @@ var bootstrap = function ($, learun) { }); } }); + //导出 + $('#lr_export').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + location.href = top.$.rootUrl + "/EvaluationTeach/Eval_Main/GetDissatisfiedExport?keyValue=" + keyValue; + } + }); // 删除 $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('VID'); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs index e8c1bd572..b7713f331 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs @@ -165,6 +165,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("INTRODUCTION")] public string Introduction { get; set; } /// + /// 考核方式 + /// + [Column("ASSESSMENTMETHODNO")] + public string AssessmentMethodNo { get; set; } + /// /// SyncFlag /// [Column("SYNCFLAG")] 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 dc692e675..1f485d4b8 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 @@ -2093,7 +2093,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,bb.Score,bb.Remark,(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 p.ExamType,bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,li.StudyScore,ls.LessonSortName,bb.Score,bb.Remark,(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 s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,Max(s.Score) as Score,MAX(s.Remark) as Remark from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); strSql.Append(" where 1=1 and s.CheckMark='1' "); @@ -2124,6 +2124,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad 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 OpenLessonPlan p on bb.AcademicYearNo=p.AcademicYearNo and bb.Semester=p.Semester and bb.MajorNo=p.MajorNo and bb.LessonNo=p.LessonNo and bb.LessonSortNo=p.LessonSortNo"); var result = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs index 051fde4f5..d6e08da0a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainBLL.cs @@ -323,6 +323,50 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach } } + public void GetExportList(string keyValue) + { + try + { + //取出数据源 + DataTable exportTable = ask_MainService.GetExportList(keyValue); + //设置导出格式 + ExcelConfig excelconfig = new ExcelConfig(); + excelconfig.Title = "评教不满意结果导出"; + excelconfig.TitleFont = "微软雅黑"; + excelconfig.TitlePoint = 23; + excelconfig.FileName = "不满意结果导出.xls"; + excelconfig.IsAllSizeColumn = true; + //每一列的设置,没有设置的列信息，系统将按datatable中的列名导出 + excelconfig.ColumnEntity = new List + { + new ColumnModel() { Column = "uname", ExcelColumn = "评教学生" }, + new ColumnModel() { Column = "uid", ExcelColumn = "学生账号" }, + new ColumnModel() { Column = "empno", ExcelColumn = "教师编号" }, + new ColumnModel() { Column = "empname", ExcelColumn = "被评教师" }, + new ColumnModel() { Column = "utext", ExcelColumn = "不满意内容" }, + new ColumnModel() { Column = "utime", ExcelColumn = "评教时间" }, + new ColumnModel() { Column = "qtitle", ExcelColumn = "问题标题" }, + new ColumnModel() { Column = "vtitle", ExcelColumn = "评教标题" }, + new ColumnModel() { Column = "academicyearno", ExcelColumn = "学年" }, + new ColumnModel() { Column = "semester", ExcelColumn = "学期" }, + new ColumnModel() { Column = "vserial", ExcelColumn = "评教编号" } + }; + //调用导出方法 + ExcelHelper.ExcelDownload(exportTable, excelconfig); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs index a57de9c50..6200097e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainIBLL.cs @@ -76,5 +76,9 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach string LessonNo); bool HasEnabled(string keyValue); + /// + /// 不满意结果导出 + /// + void GetExportList(string keyValue); } } 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 fd5a16629..5c1529544 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 @@ -82,7 +82,7 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach strSql_Elective.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "' and a.StuNo not in (select StuNo from " + misdbname + ".dbo.StuInfoBasic where ChangeStatus=1) ) aa "); strSql_Elective.Append("left join (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b on a.QID=b.QID left join Eval_Main m on a.VID=m.VID where m.Status=1) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID "); strSql_Elective.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo "); - + if (pagination != null) { //var l1 = this.BaseRepository().FindList(strSql.ToString(), pagination); @@ -572,7 +572,7 @@ where 1=1 "); strSql.Append(" and cc.EmpName like '%" + queryParam["keyword"] + "%' "); } strSql.Append(" order by ss.EmpNo,ss.LessonNo"); - + return this.BaseRepository().FindList(strSql.ToString()); } catch (Exception ex) @@ -602,7 +602,7 @@ where 1=1 "); { string sql = @"select c.* from [dbo].[Eval_Main] a left join [dbo].[Eval_Question] b on a.vid=b.vid left join[dbo].[Eval_QuestionResult] c on b.qid=c.qid - where a.vid='"+keyValue+"' and c.empno='"+EmpNo+"' and c.lessonno= '"+LessonNo+"' and c.uid= '"+stuno+"'"; + where a.vid='" + keyValue + "' and c.empno='" + EmpNo + "' and c.lessonno= '" + LessonNo + "' and c.uid= '" + stuno + "'"; return BaseRepository().FindList(sql); } catch (Exception ex) @@ -642,5 +642,34 @@ where 1=1 "); } } } + + public DataTable GetExportList(string keyValue) + { + try + { + var misdbname = BaseRepository("CollegeMIS").getDbConnection().Database; + var strSql = new StringBuilder(); + strSql.Append( + @"SELECT a.UName,a.UID,a.EmpNo,d.EmpName,a.UText,a.UTime,b.QTitle,c.VTitle,c.AcademicYearNo,c.Semester,c.VSerial + FROM [dbo].[Eval_QuestionResult] a + LEFT JOIN Eval_Question b on b.QID=a.QID + LEFT JOIN Eval_Main c on b.VID=c.VID + LEFT JOIN " + misdbname + @".dbo.EmpInfo d on d.EmpNo=a.EmpNo + where UText IS NOT NULL + AND c.VID='" + keyValue + "' ORDER BY a.UTime DESC"); + return this.BaseRepository().FindTable(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } } }