diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs index 1efd02f25..b77ea1219 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs @@ -106,6 +106,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { Pagination paginationobj = pagination.ToObject(); 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 { rows = data, @@ -205,9 +214,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// 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("提交成功!"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs index 62c5e31fa..0f307c488 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs @@ -153,11 +153,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 审核状态 /// 流程Id /// - public void ModifyStatus(string keyValue, int pastatus, string processId,string RealName) + public void ModifyStatus(string keyValue, int pastatus, string processId) { try { - dispatchService.ModifyStatus(keyValue, pastatus, processId, RealName); + dispatchService.ModifyStatus(keyValue, pastatus, processId); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs index df3705df6..0e359c151 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs @@ -109,18 +109,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("READER")] public string Reader { get; set; } - /// - /// 发起时间 - /// - /// - [Column("CREATETIME")] - public DateTime? CreateTime { get; set; } - /// - /// 发起人 - /// - /// - [Column("CREATEUSER")] - public string CreateUser { get; set; } #endregion #region 扩展操作 @@ -144,6 +132,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [NotMapped] public string Listarray { get; set; } + /// + /// 发起时间 + /// + /// + [NotMapped] + public DateTime? CreateTime { get; set; } + /// + /// 发起人 + /// + /// + [NotMapped] + public string CreateUser { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs index 91a51da7b..82432264d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs @@ -51,7 +51,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration void SaveEntity(string keyValue, DispatchEntity entity); #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); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs index a6fc92c6a..a63db7583 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs @@ -185,13 +185,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 扩展数据 - public void ModifyStatus(string keyValue, int pastatus, string processId, string RealName) + public void ModifyStatus(string keyValue, int pastatus, string processId) { try { var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.Id == keyValue); - entity.CreateUser = RealName; - entity.CreateTime = DateTime.Now; + //entity.CreateUser = RealName; + //entity.CreateTime = DateTime.Now; entity.processId = processId; entity.FlowNo = pastatus.ToString(); this.BaseRepository("CollegeMIS").Update(entity);