Преглед изворни кода

党办和校办收文发起人和发起时间取流程明细第一条

master
edy пре 3 година
родитељ
комит
e2c38f0c4a
5 измењених фајлова са 31 додато и 21 уклоњено
  1. +12
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs
  2. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs
  3. +12
    -12
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchEntity.cs
  4. +2
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs
  5. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs

+ 12
- 3
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<Pagination>();
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
/// <returns></returns>
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("提交成功!");
}



+ 2
- 2
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
/// <param name="pastatus">审核状态</param>
/// <param name="processId">流程Id</param>
/// <returns></returns>
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)
{


+ 12
- 12
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
/// </summary>
[Column("READER")]
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

#region 扩展操作
@@ -144,6 +132,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[NotMapped]
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
}
}


+ 2
- 1
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);
}
}

+ 3
- 3
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<DispatchEntity>(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);


Loading…
Откажи
Сачувај