diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs index 891c892ed..89617719e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs @@ -4,6 +4,7 @@ using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; using System.Linq; +using Learun.Application.Organization; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -18,6 +19,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { private SYS_ReceiveDocumentIBLL sYS_ReceiveDocumentIBLL = new SYS_ReceiveDocumentBLL(); private Sys_ReceiveFileIBLL receiveFileIbll=new Sys_ReceiveFileBLL(); + private RoleIBLL roleIBLL = new RoleBLL(); #region 视图功能 @@ -88,6 +90,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 阅读详情 + /// + /// + [HttpGet] + public ActionResult RoleForm() + { + return View(); + } + + #endregion #region 获取数据 @@ -154,7 +167,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(jsonData); } - + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetRoleData() + { + var data = roleIBLL.GetListForSelect(); + return Success(data); + } public ActionResult PrintInfo(string keyValue) { 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 3b7c27e01..68f26bc04 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 @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; using Learun.Application.Base.SystemModule; +using Learun.Application.Base.AuthorizeModule; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -20,6 +21,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { private Sys_ReceiveFileIBLL sys_ReceiveFileIBLL = new Sys_ReceiveFileBLL(); private AnnexesFileIBLL annexesFileIbll = new AnnexesFileBLL(); + private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); #region 视图功能 @@ -184,6 +186,30 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return Json(false, JsonRequestBehavior.AllowGet); } + + /// + /// 根据角色批示 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult RoleReceive(string strEntity) + { + Sys_IssueEntity entity = strEntity.ToObject(); + var data = userRelationIBLL.GetUserIdList(entity.SpecifyReceiver); + string userIds = ""; + foreach (var item in data) + { + if (userIds != "") + { + userIds += ","; + } + userIds += item.F_UserId; + } + entity.SpecifyReceiver = userIds; + sys_ReceiveFileIBLL.ReceiveDocumentIssue(entity); + return Success("发送成功"); + } #endregion #region 提交数据