diff --git a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs index 8532c378..57b81a6b 100644 --- a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs @@ -647,8 +647,17 @@ namespace FineUIPro.Web.HSSE.ActionPlan builder.Font.Bold = false; if (item.ApproveDate != null) { - string personName = Person_PersonsService.GetPersonsNameById(item.ApproveMan); - builder.Write(personName + " " + item.ApproveDate.ToString().Split(' ')[0]); + var getUser = Person_PersonsService.GetPerson_PersonsById(item.ApproveMan); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builder.InsertImage(file, 80, 20); + builder.Write(item.ApproveDate.ToString().Split(' ')[0]); + } + else + { + builder.Write(getUser.PersonName + " " + item.ApproveDate.ToString().Split(' ')[0]); + } } else { @@ -699,8 +708,17 @@ namespace FineUIPro.Web.HSSE.ActionPlan builder.Font.Bold = false; if (item.ApproveDate != null) { - string personName = Person_PersonsService.GetPersonsNameById(item.ApproveMan); - builder.Write(personName + " " + item.ApproveDate.ToString().Split(' ')[0]); + var getUser = Person_PersonsService.GetPerson_PersonsById(item.ApproveMan); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builder.InsertImage(file, 80, 20); + builder.Write(item.ApproveDate.ToString().Split(' ')[0]); + } + else + { + builder.Write(getUser.PersonName + " " + item.ApproveDate.ToString().Split(' ')[0]); + } } else { diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs index fb666eea..7dfd21ea 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs @@ -633,8 +633,17 @@ namespace FineUIPro.Web.ZHGL.Plan builder.Font.Bold = false; if (item.ApproveDate != null) { - string personName = Person_PersonsService.GetPersonsNameById(item.ApproveMan); - builder.Write(personName + " " + item.ApproveDate.ToString().Split(' ')[0]); + var getUser = Person_PersonsService.GetPerson_PersonsById(item.ApproveMan); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builder.InsertImage(file, 80, 20); + builder.Write(item.ApproveDate.ToString().Split(' ')[0]); + } + else + { + builder.Write(getUser.PersonName + " " + item.ApproveDate.ToString().Split(' ')[0]); + } } else { @@ -685,8 +694,17 @@ namespace FineUIPro.Web.ZHGL.Plan builder.Font.Bold = false; if (item.ApproveDate != null) { - string personName = Person_PersonsService.GetPersonsNameById(item.ApproveMan); - builder.Write(personName + " " + item.ApproveDate.ToString().Split(' ')[0]); + var getUser = Person_PersonsService.GetPerson_PersonsById(item.ApproveMan); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builder.InsertImage(file, 80, 20); + builder.Write(item.ApproveDate.ToString().Split(' ')[0]); + } + else + { + builder.Write(getUser.PersonName + " " + item.ApproveDate.ToString().Split(' ')[0]); + } } else {