From 502b9bd5d75743710ba41347b818ee7b2463afe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Wed, 3 Jul 2024 14:54:29 +0800 Subject: [PATCH] bug fixed --- New_College.Api/Controllers/Front/PcVolunteerController.cs | 4 ++-- PdfOpt/PdfOptHelper.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index 3896156..8f343af 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -257,7 +257,7 @@ namespace New_College.Api.Controllers.Front var firstmodels = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault(); planmajordesc.Where(ww => planids.Contains(ww.ID)).ToList().ForEach(a => { - string remark = string.IsNullOrWhiteSpace(a.Remark) ? "" : "("+a.Remark + ")"; + string remark = string.IsNullOrWhiteSpace(a.Remark) ? "" : "(" + a.Remark + ")"; tableDetailItemsViews.Add(new VolunteerItemsViewMinExcelAttr() { UniversityName = s.UniversityName, @@ -319,7 +319,7 @@ namespace New_College.Api.Controllers.Front }); - var stream = PdfOptHelper.CreatePdf(string.Format("{0}-{1}-{2}", query.VolunteerTableName, query.SubjectClaim, query.Score), unversityheaders.ToList(), majorlistheaders.ToList(), ulist); + var stream = PdfOptHelper.CreatePdf(string.Format("{0}-{1}-{2}", query.VolunteerTableName, query.SubjectClaim, query.Score), unversityheaders.ToList(), majorlistheaders.ToList(), ulist, query.CreateTime.Value); // 返回 PDF 文件 return File(stream.ToArray(), "application/pdf", string.Format("{0}.pdf", DateTime.Now.ToString("yyyyMMddhhssfff_"))); diff --git a/PdfOpt/PdfOptHelper.cs b/PdfOpt/PdfOptHelper.cs index e367a90..10bb72d 100644 --- a/PdfOpt/PdfOptHelper.cs +++ b/PdfOpt/PdfOptHelper.cs @@ -24,7 +24,7 @@ namespace PDFGenerateApi /// /// /// - public static MemoryStream CreatePdf(string pagetitle, List headers, List majors, List dataModels) + public static MemoryStream CreatePdf(string pagetitle, List headers, List majors, List dataModels,DateTime dtnow) { // 创建内存流 using (var stream = new MemoryStream()) @@ -57,7 +57,7 @@ namespace PDFGenerateApi Paragraph title = CreateTitle(font, pagetitle); document.Add(title); // 添加标题下方内容 - Paragraph subtitle = CreateSubTitle(font, string.Format("最后修改时间:{0}", DateTime.Now.ToString("yyyy-MM-dd HH:mm"))); + Paragraph subtitle = CreateSubTitle(font, string.Format("最后修改时间:{0}", dtnow.ToString("yyyy-MM-dd HH:mm"))); document.Add(subtitle); dataModels.ForEach(a => {