From 1c14ed902b327f8add38dac4311acd2894aea5e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 04 八月 2025 10:47:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pdf/TripSheetGenerator.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pdf/TripSheetGenerator.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pdf/TripSheetGenerator.java
index eb4a023..9e2e2f8 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pdf/TripSheetGenerator.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pdf/TripSheetGenerator.java
@@ -43,7 +43,7 @@
throw new IllegalArgumentException("订单列表不能为空");
}
- String fileName = "行程单_" + UUID.randomUUID() + ".pdf";
+ String fileName = "贵人家园行程单_" + UUID.randomUUID() + ".pdf";
String filePath = pdfDir + fileName;
File file = new File(filePath);
FileUtils.forceMkdirParent(file);
@@ -142,12 +142,14 @@
Font infoFont = getChineseFont(10, Font.NORMAL);
// 申请时间现在的时间
String applyTime = DATE_TIME_FORMATTER.format(LocalDateTime.now());
+// 首先定义SimpleDateFormat（可以是类的静态成员）
+ SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- // 行程时间格式化
String tripTimeStart = first.getBoardingTime() != null
- ? DATE_TIME_FORMATTER.format(first.getBoardingTime()) : "N/A";
+ ? DATE_FORMATTER.format(first.getBoardingTime()) : "N/A";
String tripTimeEnd = last.getBoardingTime() != null
- ? DATE_TIME_FORMATTER.format(last.getBoardingTime()) : "N/A";
+ ? DATE_FORMATTER.format(last.getBoardingTime()) : "N/A";
+
String tripTime = tripTimeStart + " 至 " + tripTimeEnd;
// 总金额计算（修复：先定义 totalText 并拼接内容）
@@ -261,7 +263,7 @@
cell.setHorizontalAlignment(Element.ALIGN_CENTER);
table.addCell(cell);
}
-
+ SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 格式可根据需求调整
// 单元格样式（居中对齐，统一处理）
Font cellFont = getChineseFont(9, Font.NORMAL);
for (int i = 0; i < orders.size(); i++) {
@@ -272,7 +274,7 @@
addCenteredCell(table, order.getServerCarModel(), cellFont);
addCenteredCell(table,
order.getBoardingTime() != null
- ? DATE_TIME_FORMATTER.format(order.getBoardingTime())
+ ? DATE_FORMATTER.format(order.getBoardingTime()) // Date类型用SimpleDateFormat的format方法
: "N/A",
cellFont);
addCenteredCell(table, order.getCity(), cellFont);
@@ -301,11 +303,6 @@
table.addCell(cell);
}
- private void addTableCell(PdfPTable table, String text, Font font) {
- PdfPCell cell = new PdfPCell(new Paragraph(text != null ? text : "", font));
- cell.setPadding(5);
- table.addCell(cell);
- }
/**
* 获取中文字体，优先自定义字体，fallback到 CJK 内置
--
Gitblit v1.7.1