From 926e065fb0b4424d0d51023c234a92433bac61c8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 八月 2025 11:53:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/pdf/TripSheetGenerator.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..23c7f29 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
@@ -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);
--
Gitblit v1.7.1