yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixed

develop
old易 2024-07-03 14:54:29 +08:00
parent 565a8c5422
commit 502b9bd5d7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
New_College.Api/Controllers/Front/PcVolunteerController.cs
View File

@ -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_")));

4
PdfOpt/PdfOptHelper.cs
View File

@ -24,7 +24,7 @@ namespace PDFGenerateApi
/// <param name="majors"></param>
/// <param name="dataModels"></param>
/// <returns></returns>
public static MemoryStream CreatePdf(string pagetitle, List<string> headers, List<string> majors, List<dataModel> dataModels)
public static MemoryStream CreatePdf(string pagetitle, List<string> headers, List<string> majors, List<dataModel> 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 =>
{