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 287b67d6c..e4dc1d8ad 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 @@ -295,6 +295,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult PrintScore() { + ViewBag.StuNo = Request["StuNo"]; return View(); } #endregion @@ -1289,7 +1290,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult DataFilling(string keyValue) { //毕业表 - var StuInfoGraduateEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(keyValue); + var StuInfoGraduateEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByKeyword(keyValue); if (StuInfoGraduateEntity == null) { return View(new StuInfoBasicEntity()); 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 636eeb2b8..56bde1218 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 @@ -38,7 +38,7 @@ var bootstrap = function ($, learun) { $('#lr_print').on('click', function () { var StuNo = $.trim($('#StuNo').val()); if (StuNo == null || StuNo == "") { - learun.alert.warning("请输入学号!"); + learun.alert.warning("请输入学号或姓名!"); return; } learun.layerForm({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/PrintScore.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/PrintScore.cshtml index 733d72d74..04a305d66 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/PrintScore.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/PrintScore.cshtml @@ -6,7 +6,7 @@ @Html.AppendJsFile("/Content/jquery/plugin/jqprint/jQuery.print.js")
 打印 -
+
学号:
@@ -42,9 +42,9 @@ $('#lr_print').click(function () { $('#printBox').print() }) - var keyValue = request('StuNo') + //var keyValue = request('StuNo') $.ajax({ - url: top.$.rootUrl + '/EducationalAdministration/StuScore/DataFilling?keyValue=' + keyValue, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/DataFilling?keyValue=@ViewBag.StuNo', type: "get", dataType: "json", async: false, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/StuInfoGraduate/header2.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/StuInfoGraduate/header2.png new file mode 100644 index 000000000..a0a97f060 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/StuInfoGraduate/header2.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index a9bab02be..daa625e1d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -2618,6 +2618,11 @@ + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs index 607d936e4..1af780ef5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs @@ -253,6 +253,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public StuInfoBasicEntity GetStuInfoBasicEntityByKeyword(string keyword) + { + try + { + return stuInfoBasicService.GetStuInfoBasicEntityByKeyword(keyword); + } + 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/StuInfoBasic/StuInfoBasicIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs index 22aa95451..c7b3fbb86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs @@ -43,6 +43,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration string GetPhotoByStuNo(string enCode); StuInfoBasicEntity GetStuInfoBasicEntityByStuName(string name); + StuInfoBasicEntity GetStuInfoBasicEntityByKeyword(string keyword); /// /// 获取左侧树形数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index a94eb0170..295737062 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -397,6 +397,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public StuInfoBasicEntity GetStuInfoBasicEntityByKeyword(string keyword) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(a => a.StuName == keyword || a.StuNo == keyword); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取StuInfoBasic表实体数据 /// 主键