From 4fb83302e08287b3e2148e1c1d83f8c11d5e404a Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Thu, 11 Mar 2021 10:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=8E=A5=E6=94=B6=E6=89=B9?= =?UTF-8?q?=E7=A4=BA=E5=85=A8=E9=83=A8=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Sys_ReceiveFileController.cs | 16 +++++++++++ .../Views/Sys_ReceiveFile/Form.cshtml | 4 +++ .../Views/Sys_ReceiveFile/Form.js | 21 +++++++++++++- .../Sys_ReceiveFile/Sys_ReceiveFileBLL.cs | 19 +++++++++++++ .../Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs | 1 + .../Sys_ReceiveFile/Sys_ReceiveFileService.cs | 28 +++++++++++++++++-- 6 files changed, 86 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs index 490ed7d09..8408003d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs @@ -120,6 +120,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(jsonData); } /// + /// 获取批示信息 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetInstructions(string keyValue) + { + var data = sys_ReceiveFileIBLL.GetInstructions(keyValue); + var jsonData = new + { + rows = data, + }; + return Success(jsonData); + } + /// /// 获取页面显示列表数据 /// /// 查询参数 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml index faeeea12f..f9bbe88e0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml @@ -31,5 +31,9 @@
通知管理员
+
+
批示记录
+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js index 6b659a9f4..dacd3a3b1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js @@ -58,6 +58,25 @@ var bootstrap = function ($, learun) { } $("#lrUploader_uploadBtn_Url").hide(); }); + + var data= learun.httpGet(top.$.rootUrl + + '/EducationalAdministration/Sys_ReceiveFile/GetInstructions?keyValue=' + + keyValue, + ''); + console.log(data); + + $('#gridtable').jfGrid({ + headData: [ + { label: "批阅人", name: "Receiver", width: 100, align: "left" }, + { label: "内容", name: "SpecifyReceiver", width: 500, align: "left" }, + ], + mainId: 'RFileId', + isPage: true, + sidx: 'SendTime', + sord: 'DESC' + }); + $('#gridtable').jfGridSet('refreshdata', data.data.rows); + } } }; @@ -66,7 +85,7 @@ var bootstrap = function ($, learun) { if (!$('body').lrValidform()) { return false; } - + var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs index 5e32f9e53..13e9e0215 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs @@ -368,6 +368,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public object GetInstructions(string keyValue) + { + try + { + return sys_ReceiveFileService.GetInstructions(keyValue); + } + 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/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs index 0609efcc9..7a4a730ff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs @@ -84,5 +84,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration void ReceiveDocumentIssue(Sys_IssueEntity entity); string ZhuRenP(); string XiaoZhangP(); + object GetInstructions(string keyValue); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs index c45480df4..5ad25ebcf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs @@ -145,7 +145,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var userInfo = LoginUserInfo.Get(); - var list = this.BaseRepository().FindList(a => a.SenderId == userId && a.RStatus==0); + var list = this.BaseRepository().FindList(a => a.SenderId == userId && a.RStatus == 0); return list; } catch (Exception ex) @@ -537,7 +537,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string XiaoZhangP() { - var xiaozhangID = this.BaseRepository().FindEntity(a=>a.F_RealName.Contains("关亮"))?.F_UserId; + var xiaozhangID = this.BaseRepository().FindEntity(a => a.F_RealName.Contains("关亮"))?.F_UserId; return xiaozhangID; } @@ -687,5 +687,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public object GetInstructions(string keyValue) + { + try + { + var sendId = this.BaseRepository().FindEntity(a => a.RFileId == keyValue) + ?.SFileId; + var data = this.BaseRepository().FindList(a => a.SFileId == sendId && a.SpecifyReceiver != null) + .OrderBy(a => a.ReplyTime); + + return data; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + + } } }