@@ -120,6 +120,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
return Success(jsonData); | return Success(jsonData); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// 获取批示信息 | |||||
/// <summary> | |||||
/// <param name="queryJson">查询参数</param> | |||||
/// <returns></returns> | |||||
[HttpGet] | |||||
[AjaxOnly] | |||||
public ActionResult GetInstructions(string keyValue) | |||||
{ | |||||
var data = sys_ReceiveFileIBLL.GetInstructions(keyValue); | |||||
var jsonData = new | |||||
{ | |||||
rows = data, | |||||
}; | |||||
return Success(jsonData); | |||||
} | |||||
/// <summary> | |||||
/// 获取页面显示列表数据 | /// 获取页面显示列表数据 | ||||
/// <summary> | /// <summary> | ||||
/// <param name="queryJson">查询参数</param> | /// <param name="queryJson">查询参数</param> | ||||
@@ -31,5 +31,9 @@ | |||||
<div class="lr-form-item-title">通知管理员</div> | <div class="lr-form-item-title">通知管理员</div> | ||||
<div id="RStatus"></div> | <div id="RStatus"></div> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item"> | |||||
<div class="lr-form-item-title">批示记录</div> | |||||
<div id="gridtable"></div> | |||||
</div> | |||||
</div> | </div> | ||||
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js") | @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js") |
@@ -58,6 +58,25 @@ var bootstrap = function ($, learun) { | |||||
} | } | ||||
$("#lrUploader_uploadBtn_Url").hide(); | $("#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()) { | if (!$('body').lrValidform()) { | ||||
return false; | return false; | ||||
} | } | ||||
var postData = { | var postData = { | ||||
strEntity: JSON.stringify($('body').lrGetFormData()) | strEntity: JSON.stringify($('body').lrGetFormData()) | ||||
}; | }; | ||||
@@ -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 | #endregion | ||||
} | } | ||||
@@ -84,5 +84,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
void ReceiveDocumentIssue(Sys_IssueEntity entity); | void ReceiveDocumentIssue(Sys_IssueEntity entity); | ||||
string ZhuRenP(); | string ZhuRenP(); | ||||
string XiaoZhangP(); | string XiaoZhangP(); | ||||
object GetInstructions(string keyValue); | |||||
} | } | ||||
} | } |
@@ -145,7 +145,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
try | try | ||||
{ | { | ||||
var userInfo = LoginUserInfo.Get(); | var userInfo = LoginUserInfo.Get(); | ||||
var list = this.BaseRepository().FindList<Sys_ReceiveFileEntity>(a => a.SenderId == userId && a.RStatus==0); | |||||
var list = this.BaseRepository().FindList<Sys_ReceiveFileEntity>(a => a.SenderId == userId && a.RStatus == 0); | |||||
return list; | return list; | ||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
@@ -537,7 +537,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
public string XiaoZhangP() | public string XiaoZhangP() | ||||
{ | { | ||||
var xiaozhangID = this.BaseRepository().FindEntity<UserEntity>(a=>a.F_RealName.Contains("关亮"))?.F_UserId; | |||||
var xiaozhangID = this.BaseRepository().FindEntity<UserEntity>(a => a.F_RealName.Contains("关亮"))?.F_UserId; | |||||
return xiaozhangID; | return xiaozhangID; | ||||
} | } | ||||
@@ -687,5 +687,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
public object GetInstructions(string keyValue) | |||||
{ | |||||
try | |||||
{ | |||||
var sendId = this.BaseRepository().FindEntity<Sys_ReceiveFileEntity>(a => a.RFileId == keyValue) | |||||
?.SFileId; | |||||
var data = this.BaseRepository().FindList<Sys_ReceiveFileEntity>(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); | |||||
} | |||||
} | |||||
} | |||||
} | } | ||||
} | } |