From 7d6825d2344db398b7cd142fea419242db033c54 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 14:37:50 +0800
Subject: [PATCH] fix(excel): 修复导入模板下载失败的两个问题
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java | 2
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalTimeConvert.java | 72 ++++++++++++++++++++++++++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleImportExcelVO.java | 5 +-
3 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalTimeConvert.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalTimeConvert.java
new file mode 100644
index 0000000..df94eb0
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalTimeConvert.java
@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.framework.excel.core.convert;
+
+import cn.hutool.core.util.StrUtil;
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * LocalTime 杞崲鍣�
+ *
+ * FastExcel锛坈n.idev.excel锛夊唴缃笉鏀寔 LocalTime锛屾湭鎸囧畾 converter 鏃惰鍐欓兘浼氭姏鍑�
+ * `Can not find 'Converter' support class LocalTime`銆傝繖閲岃ˉ涓娿�孒H:mm:ss 瀛楃涓层�嶄笌
+ * 銆孍xcel 鏃堕棿鏁板�硷紙涓�澶╃殑鍗犳瘮锛夈�嶄袱绉嶅啓娉曠殑璇诲啓鏀寔銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public class LocalTimeConvert implements Converter<LocalTime> {
+
+ private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss");
+
+ @Override
+ public Class<LocalTime> supportJavaTypeKey() {
+ return LocalTime.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public LocalTime convertToJavaData(ReadCellData readCellData, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ // 鎯呭喌涓�锛欵xcel 閲屽~鐨勬槸鏃堕棿鏁板�硷紙涓�澶╃殑鍗犳瘮锛�
+ if (CellDataTypeEnum.NUMBER.equals(readCellData.getType())) {
+ BigDecimal numberValue = readCellData.getNumberValue();
+ if (numberValue == null) {
+ return null;
+ }
+ long secondOfDay = Math.round(numberValue.doubleValue() * 24 * 60 * 60) % (24 * 60 * 60);
+ return LocalTime.ofSecondOfDay(secondOfDay);
+ }
+ // 鎯呭喌浜岋細Excel 閲屽~鐨勬槸鏂囨湰锛屽 8:30 / 08:30:00
+ String text = readCellData.getStringValue();
+ if (StrUtil.isBlank(text)) {
+ return null;
+ }
+ try {
+ String[] parts = text.trim().replace('锛�', ':').split(":");
+ int hour = Integer.parseInt(parts[0].trim());
+ int minute = parts.length > 1 ? Integer.parseInt(parts[1].trim()) : 0;
+ int second = parts.length > 2 ? Integer.parseInt(parts[2].trim()) : 0;
+ return LocalTime.of(hour, minute, second);
+ } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
+ return null;
+ }
+ }
+
+ @Override
+ public WriteCellData<String> convertToExcelData(LocalTime value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(value == null ? "" : value.format(TIME_FORMATTER));
+ }
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleImportExcelVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleImportExcelVO.java
index b913ca3..850dbea 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleImportExcelVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleImportExcelVO.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo;
import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.framework.excel.core.convert.LocalTimeConvert;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -24,10 +25,10 @@
@ExcelProperty("閮ㄩ棬鍚嶇О")
private String deptName;
- @ExcelProperty("涓婄彮鏃堕棿")
+ @ExcelProperty(value = "涓婄彮鏃堕棿", converter = LocalTimeConvert.class)
private LocalTime workStartTime;
- @ExcelProperty("涓嬬彮鏃堕棿")
+ @ExcelProperty(value = "涓嬬彮鏃堕棿", converter = LocalTimeConvert.class)
private LocalTime workEndTime;
@ExcelProperty("杩熷埌鍏佽鍒嗛挓鏁�")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
index 1a16111..9f63316 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
@@ -145,7 +145,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "濮斿妫�娴�/璇曢獙鍗曞鍏ユā鏉�.xls", "濮斿妫�娴�/璇曢獙鍗曞垪琛�", MesQcOutsourceTestImportExcelVO.class, list);
+ ExcelUtils.write(response, "濮斿妫�娴嬭瘯楠屽崟瀵煎叆妯℃澘.xls", "濮斿妫�娴嬭瘯楠屽崟鍒楄〃", MesQcOutsourceTestImportExcelVO.class, list);
}
@PostMapping("/import")
--
Gitblit v1.9.3