@@ -106,6 +106,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
{ | { | ||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | Pagination paginationobj = pagination.ToObject<Pagination>(); | ||||
var data = dispatchIBLL.GetPageList(paginationobj, queryJson); | var data = dispatchIBLL.GetPageList(paginationobj, queryJson); | ||||
foreach (var item in data) | |||||
{ | |||||
var NewList = nWFTaskIBLL.GetLogList(item.processId).OrderBy(o => o.F_CreateDate).ToList(); | |||||
if (NewList.Count > 0) | |||||
{ | |||||
item.CreateTime = NewList.First().F_CreateDate; | |||||
item.CreateUser = NewList.First().F_CreateUserName; | |||||
} | |||||
} | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
rows = data, | rows = data, | ||||
@@ -205,9 +214,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
/// <returns></returns> | /// <returns></returns> | ||||
public ActionResult ModifyStatus(string keyValue, int pastatus, string processId) | public ActionResult ModifyStatus(string keyValue, int pastatus, string processId) | ||||
{ | { | ||||
var userInfo = LoginUserInfo.Get(); | |||||
var RealName = userInfo.realName; | |||||
dispatchIBLL.ModifyStatus(keyValue, pastatus, processId, RealName); | |||||
//var userInfo = LoginUserInfo.Get(); | |||||
//var RealName = userInfo.realName; | |||||
dispatchIBLL.ModifyStatus(keyValue, pastatus, processId); | |||||
return Success("提交成功!"); | return Success("提交成功!"); | ||||
} | } | ||||
@@ -153,11 +153,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
/// <param name="pastatus">审核状态</param> | /// <param name="pastatus">审核状态</param> | ||||
/// <param name="processId">流程Id</param> | /// <param name="processId">流程Id</param> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
public void ModifyStatus(string keyValue, int pastatus, string processId,string RealName) | |||||
public void ModifyStatus(string keyValue, int pastatus, string processId) | |||||
{ | { | ||||
try | try | ||||
{ | { | ||||
dispatchService.ModifyStatus(keyValue, pastatus, processId, RealName); | |||||
dispatchService.ModifyStatus(keyValue, pastatus, processId); | |||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
{ | { | ||||
@@ -109,18 +109,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
/// </summary> | /// </summary> | ||||
[Column("READER")] | [Column("READER")] | ||||
public string Reader { get; set; } | public string Reader { get; set; } | ||||
/// <summary> | |||||
/// 发起时间 | |||||
/// </summary> | |||||
/// <returns></returns> | |||||
[Column("CREATETIME")] | |||||
public DateTime? CreateTime { get; set; } | |||||
/// <summary> | |||||
/// 发起人 | |||||
/// </summary> | |||||
/// <returns></returns> | |||||
[Column("CREATEUSER")] | |||||
public string CreateUser { get; set; } | |||||
#endregion | #endregion | ||||
#region 扩展操作 | #region 扩展操作 | ||||
@@ -144,6 +132,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
[NotMapped] | [NotMapped] | ||||
public string Listarray { get; set; } | public string Listarray { get; set; } | ||||
/// <summary> | |||||
/// 发起时间 | |||||
/// </summary> | |||||
/// <returns></returns> | |||||
[NotMapped] | |||||
public DateTime? CreateTime { get; set; } | |||||
/// <summary> | |||||
/// 发起人 | |||||
/// </summary> | |||||
/// <returns></returns> | |||||
[NotMapped] | |||||
public string CreateUser { get; set; } | |||||
#endregion | #endregion | ||||
} | } | ||||
} | } | ||||
@@ -51,7 +51,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
void SaveEntity(string keyValue, DispatchEntity entity); | void SaveEntity(string keyValue, DispatchEntity entity); | ||||
#endregion | #endregion | ||||
void ModifyStatus(string keyValue, int pastatus, string processId, string RealName); | |||||
void ModifyStatus(string keyValue, int pastatus, string processId); | |||||
//void ModifyStatus(string keyValue, int pastatus, string processId, string RealName); | |||||
void ModifyStatusByProcessId(int i, string processId); | void ModifyStatusByProcessId(int i, string processId); | ||||
} | } | ||||
} | } |
@@ -185,13 +185,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
#region 扩展数据 | #region 扩展数据 | ||||
public void ModifyStatus(string keyValue, int pastatus, string processId, string RealName) | |||||
public void ModifyStatus(string keyValue, int pastatus, string processId) | |||||
{ | { | ||||
try | try | ||||
{ | { | ||||
var entity = this.BaseRepository("CollegeMIS").FindEntity<DispatchEntity>(a => a.Id == keyValue); | var entity = this.BaseRepository("CollegeMIS").FindEntity<DispatchEntity>(a => a.Id == keyValue); | ||||
entity.CreateUser = RealName; | |||||
entity.CreateTime = DateTime.Now; | |||||
//entity.CreateUser = RealName; | |||||
//entity.CreateTime = DateTime.Now; | |||||
entity.processId = processId; | entity.processId = processId; | ||||
entity.FlowNo = pastatus.ToString(); | entity.FlowNo = pastatus.ToString(); | ||||
this.BaseRepository("CollegeMIS").Update(entity); | this.BaseRepository("CollegeMIS").Update(entity); | ||||