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 1a6d2db42..c27ebd42f 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
@@ -232,7 +232,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
for (int i = 0; i < array.Length; i++)
{
- if (array[i].Trim()!="")
+ if (array[i].Trim() != "")
{
str += array[i].Substring(0, array[i].IndexOf(".")) + ",";
}
@@ -268,35 +268,33 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
}
#endregion
- #region 获取校长的签名盖章 批示+时间+阅
+ #region 获取校长的签名盖章+ 批示+时间+阅
//var listTaskLog = nWFTaskIBLL.GetLogList(dispatchEntity.processId);
- var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).OrderBy(o => o.F_CreateDate).ToList();
- var Auditlist = dispatchAuditIBLL.ReadList(keyValue);
- if (PrintList.Count > 0)
+ var firstList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).OrderBy(o => o.F_CreateDate).ToList();
+ for (int i = 1; i < firstList.Count; i++)
{
- for (int i = 1; i < PrintList.Count; i++)
+ if (i == 1)
{
- if (i == 1)
- {
- dispatchEntity.Render = PrintList[i].F_Des;
- ViewBag.StampImg = PrintList[i].F_StampImg;
- ViewBag.SignImg = PrintList[i].F_SignImg;
- }
- dispatchEntity.Listarray += PrintList[i].F_CreateUserName + PrintList[i].F_CreateDate + "阅" + "&";
+ dispatchEntity.Render = firstList[i].F_Des;
+ ViewBag.pSList += firstList[i].F_CreateUserName + firstList[i].F_CreateDate + "阅" + "&";
}
}
- if (Auditlist != null)
+ var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).GroupBy(o => o.F_CreateUserName).Select(o => new
{
- for (int i = 0; i < Auditlist.Count; i++)
+ F_CreateDate = o.FirstOrDefault().F_CreateDate,
+ F_CreateUserName = o.FirstOrDefault().F_CreateUserName,
+ });
+ var newList = PrintList.Where(s => PrintList.Select(mo => mo.F_CreateDate).Contains(s.F_CreateDate)).OrderBy(s => s.F_CreateDate).ToList();
+ for (int i = 1; i < newList.Count; i++)
+ {
+ if (!ViewBag.pSList.Contains(newList[i].F_CreateUserName))
{
- dispatchEntity.Listarray += Auditlist[i].AuditName + Auditlist[i].AuditTime + "阅" + "&";
+ ViewBag.pSList += newList[i].F_CreateUserName + newList[i].F_CreateDate + "阅" + "&";
}
}
- dispatchEntity.Listarray = dispatchEntity.Listarray.TrimEnd('&');
- List
@Model.DisFrom
@*@Model.Copies - 份 数 *@ + 份 数 *@ @Model.DisWork 字 @Model.DisMark @@ -266,10 +270,10 @@
@Model.DisOffice 收 文 单 位 @@ -312,6 +320,7 @@ @Model.DisMonth月 @Model.DisDay日
+