From 68317d44b233f28150336bbf3aa3a32400552437 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 02 十一月 2026 11:02:08 +0800
Subject: [PATCH] fix(excel): 导入模板日期改为文本显示,修复显示为 Excel 序列号
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java | 16 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java | 20 ++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 2
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java | 16 +-
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 2
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateStringConverter.java | 40 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java | 2
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java | 2
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java | 2
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java | 2
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateTimeStringConverter.java | 37 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java | 2
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/DateAsTextCellWriteHandler.java | 58 +++++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java | 2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java | 2
yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java | 20 +-
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java | 2
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java | 29 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java | 2
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java | 2
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java | 33 +++++
27 files changed, 261 insertions(+), 44 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateStringConverter.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateStringConverter.java
new file mode 100644
index 0000000..8f38ee0
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateStringConverter.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.framework.excel.core.convert;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * LocalDate 鍐欏嚭涓虹函鏂囨湰锛坹yyy-MM-dd锛夌殑杞崲鍣�
+ *
+ * 榛樿 FastExcel 鎶婃棩鏈熷啓鎴愩�屾棩鏈熷崟鍏冩牸銆嶏紝鍦� Excel 閲屾樉绀轰负 46023.0 杩欑被搴忓垪鍙凤紝
+ * 浣跨敤鑰呯湅涓嶆噦璇ュ~浠�涔堟牸寮忋�傚鍏ユā鏉跨被鍦烘櫙娉ㄥ唽鏈浆鎹㈠櫒鍚庯紝鏃ユ湡浠ユ枃鏈緭鍑猴紝鐩磋鍙銆�
+ *
+ * 娉ㄦ剰锛氫粎鐢ㄤ簬銆屽啓鍑烘ā鏉裤�嶏紝涓嶈鐢ㄤ簬瀵煎叆瑙f瀽銆�
+ */
+public class LocalDateStringConverter implements Converter<LocalDate> {
+
+ private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+ @Override
+ public Class<LocalDate> supportJavaTypeKey() {
+ return LocalDate.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public WriteCellData<?> convertToExcelData(LocalDate value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(value.format(FORMATTER));
+ }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateTimeStringConverter.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateTimeStringConverter.java
new file mode 100644
index 0000000..cbb9f6e
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/LocalDateTimeStringConverter.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.framework.excel.core.convert;
+
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * LocalDateTime 鍐欏嚭涓虹函鏂囨湰锛坹yyy-MM-dd HH:mm:ss锛夌殑杞崲鍣�
+ *
+ * 鐢ㄩ�斿悓 {@link LocalDateStringConverter}锛岄伩鍏嶆椂闂存樉绀轰负 Excel 搴忓垪鍙枫��
+ */
+public class LocalDateTimeStringConverter implements Converter<LocalDateTime> {
+
+ private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ @Override
+ public Class<LocalDateTime> supportJavaTypeKey() {
+ return LocalDateTime.class;
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
+
+ @Override
+ public WriteCellData<?> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty,
+ GlobalConfiguration globalConfiguration) {
+ return new WriteCellData<>(value.format(FORMATTER));
+ }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/DateAsTextCellWriteHandler.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/DateAsTextCellWriteHandler.java
new file mode 100644
index 0000000..c4d233f
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/DateAsTextCellWriteHandler.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.framework.excel.core.handler;
+
+import cn.idev.excel.write.handler.CellWriteHandler;
+import cn.idev.excel.write.handler.context.CellWriteHandlerContext;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 鎶婃棩鏈熷崟鍏冩牸寮哄埗鍐欐垚绾枃鏈殑澶勭悊鍣�
+ *
+ * 鑳屾櫙锛欶astExcel 鍦ㄥ啓鍑烘椂锛屽嵆浣挎敞鍐屼簡瀛楃涓茶浆鎹㈠櫒锛屾棩鏈熷瓧娈典粛鍙兘琚唴缃殑
+ * Number 杞崲鍣ㄦ帴绠★紝鏈�缁堝湪 Excel 閲屾樉绀轰负 46023.0 杩欑被搴忓垪鍙凤紝浣跨敤鑰呯湅涓嶆噦銆�
+ *
+ * 鏈鐞嗗櫒鍦ㄥ崟鍏冩牸鍐欏畬鍚庝粙鍏ワ紝鎶� LocalDate / LocalDateTime 绫诲瀷鐨勫師濮嬪��
+ * 鏍煎紡鍖栦负 yyyy-MM-dd / yyyy-MM-dd HH:mm:ss 骞朵互鏂囨湰鍐欏叆銆�
+ *
+ * 浠呯敤浜庛�屼笅杞藉鍏ユā鏉裤�嶏紝涓嶅奖鍝嶅鍏ヨВ鏋愩��
+ */
+public class DateAsTextCellWriteHandler implements CellWriteHandler {
+
+ private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ @Override
+ public void afterCellDispose(CellWriteHandlerContext context) {
+ // 鍙鐞嗘暟鎹锛岃烦杩囪〃澶�
+ if (Boolean.TRUE.equals(context.getHead())) {
+ return;
+ }
+ Object value = context.getOriginalValue();
+ if (value == null) {
+ return;
+ }
+ String text = null;
+ if (value instanceof LocalDate localDate) {
+ text = localDate.format(DATE_FORMATTER);
+ } else if (value instanceof LocalDateTime localDateTime) {
+ text = localDateTime.format(DATETIME_FORMATTER);
+ } else if (value instanceof java.util.Date date) {
+ text = date.toInstant().atZone(java.time.ZoneId.systemDefault())
+ .toLocalDate().format(DATE_FORMATTER);
+ }
+ if (text == null) {
+ return;
+ }
+ Cell cell = context.getCell();
+ if (cell == null) {
+ return;
+ }
+ cell.setCellType(CellType.STRING);
+ cell.setCellValue(text);
+ }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
index 5a9b24d..552f088 100644
--- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
@@ -9,7 +9,10 @@
import cn.idev.excel.event.AnalysisEventListener;
import cn.idev.excel.metadata.CellExtra;
import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
+import cn.iocoder.yudao.framework.excel.core.convert.LocalDateStringConverter;
+import cn.iocoder.yudao.framework.excel.core.convert.LocalDateTimeStringConverter;
import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy;
+import cn.iocoder.yudao.framework.excel.core.handler.DateAsTextCellWriteHandler;
import cn.iocoder.yudao.framework.excel.core.handler.SelectSheetWriteHandler;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;
@@ -66,6 +69,32 @@
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
}
+ /**
+ * 杈撳嚭 Excel 妯℃澘锛堟棩鏈熸寜鏂囨湰娓叉煋锛�
+ *
+ * 涓� {@link #write} 鐨勫尯鍒細棰濆娉ㄥ唽浜� {@link LocalDateStringConverter}锛�
+ * 鎶� LocalDate / LocalDateTime 鍐欐垚 yyyy-MM-dd 鏂囨湰锛岃�屼笉鏄� Excel 鏃ユ湡搴忓垪鍙枫��
+ * 浠呯敤浜庛�屼笅杞藉鍏ユā鏉裤�嶏紝瀵煎叆瑙f瀽浠嶈蛋 {@link #read}锛屼笉鍙楀奖鍝嶃��
+ */
+ public static <T> void writeTemplate(HttpServletResponse response, String filename, String sheetName,
+ Class<T> head, List<T> data) throws IOException {
+ ExcelWriter excelWriter = FastExcelFactory.write(response.getOutputStream(), head)
+ .autoCloseStream(false)
+ .registerWriteHandler(new ColumnWidthMatchStyleStrategy())
+ .registerWriteHandler(new SelectSheetWriteHandler(head))
+ .registerWriteHandler(new DateAsTextCellWriteHandler())
+ .registerConverter(new LongStringConverter())
+ .build();
+ try {
+ excelWriter.write(data, FastExcelFactory.writerSheet(sheetName).build());
+ } finally {
+ excelWriter.finish();
+ excelWriter.close();
+ }
+ response.addHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename));
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ }
+
public static <T> List<T> read(MultipartFile file, Class<T> head) throws IOException {
// 鍙傝�� https://t.zsxq.com/zM77F 甯栧瓙锛屽鍔� try 澶勭悊锛屽吋瀹� windows 鍦烘櫙
try (InputStream inputStream = file.getInputStream()) {
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
index bc20fe7..303a062 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
@@ -221,7 +221,7 @@
.productCode("ITEM001").productName("绀轰緥浜у搧A")
.count(new BigDecimal("100")).contractPrice(new BigDecimal("20.00")).remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
.build());
- ExcelUtils.write(response, "鍚堝悓瀵煎叆妯℃澘.xls", "鍚堝悓", CrmContractImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍚堝悓瀵煎叆妯℃澘.xls", "鍚堝悓", CrmContractImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
index 7902835..fe4aa48 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
@@ -281,17 +281,17 @@
@GetMapping("/get-import-template")
@Operation(summary = "鑾峰緱瀵煎叆瀹㈡埛妯℃澘")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 绀轰緥瀹㈡埛锛氬悕绉�/鎵嬫満/閭鍧囦娇鐢ㄥ崰浣嶅�硷紝閬垮厤鐓ф妱瀹樻柟 demo 浜х敓鍋囨暟鎹�
List<CrmCustomerImportExcelVO> list = Arrays.asList(
- CrmCustomerImportExcelVO.builder().name("瓒呯骇绠$悊鍛�").industryId(1).level(1).source(1)
- .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
- .areaId(null).detailAddress("").remark("").autoPoolEnabled(true).build(),
- CrmCustomerImportExcelVO.builder().name("婧愮爜").industryId(1).level(1).source(1)
- .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
- .areaId(null).detailAddress("").remark("").autoPoolEnabled(true).build()
+ CrmCustomerImportExcelVO.builder().name("绀轰緥瀹㈡埛A锛堣鏇挎崲锛�").industryId(1).level(1).source(1)
+ .mobile("13800000001").telephone("").qq("").wechat("").email("customerA@example.com")
+ .areaId(null).detailAddress("").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�").autoPoolEnabled(true).build(),
+ CrmCustomerImportExcelVO.builder().name("绀轰緥瀹㈡埛B锛堣鏇挎崲锛�").industryId(1).level(1).source(1)
+ .mobile("13800000002").telephone("").qq("").wechat("").email("customerB@example.com")
+ .areaId(null).detailAddress("").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�").autoPoolEnabled(true).build()
);
// 杈撳嚭
- ExcelUtils.write(response, "瀹㈡埛瀵煎叆妯℃澘.xls", "瀹㈡埛鍒楄〃", CrmCustomerImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "瀹㈡埛瀵煎叆妯℃澘.xls", "瀹㈡埛鍒楄〃", CrmCustomerImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
index 3ef2373..65191f9 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/CrmInvoiceController.java
@@ -157,7 +157,7 @@
.invoiceNo("02564178").invoiceTitle("绀轰緥瀹㈡埛鏈夐檺鍏徃").price(new BigDecimal("10000.00"))
.invoiceTime("2026-01-01 10:00:00").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
.build());
- ExcelUtils.write(response, "寮�绁ㄥ鍏ユā鏉�.xls", "寮�绁�", CrmInvoiceImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "寮�绁ㄥ鍏ユā鏉�.xls", "寮�绁�", CrmInvoiceImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
index ccebe86..d4e06df 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
@@ -182,7 +182,7 @@
.orderTime("2026-01-01 10:00:00").productCode("ITEM001").productName("绀轰緥浜у搧A")
.count(new BigDecimal("100")).productPrice(new BigDecimal("10.00"))
.taxPercent(new BigDecimal("13")).qcCheckFlag("鍚�").remark("绀轰緥").build());
- ExcelUtils.write(response, "閲囪喘璁㈠崟瀵煎叆妯℃澘.xls", "閲囪喘璁㈠崟", ErpPurchaseOrderImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閲囪喘璁㈠崟瀵煎叆妯℃澘.xls", "閲囪喘璁㈠崟", ErpPurchaseOrderImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index 0175677..49565c2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -150,7 +150,7 @@
.count(new BigDecimal("100")).productPrice(new BigDecimal("10.00"))
.taxPercent(new BigDecimal("13")).demandTime("2026-01-10")
.qcCheckFlag("鍚�").remark("绀轰緥").build());
- ExcelUtils.write(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠", ErpPurchaseRequestImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠", ErpPurchaseRequestImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index d08ac09..18f0890 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -220,7 +220,7 @@
.orderTime("2026-01-01 10:00:00").productCode("ITEM001").productName("绀轰緥浜у搧A")
.count(new BigDecimal("100")).productPrice(new BigDecimal("20.00"))
.taxPercent(new BigDecimal("13")).needProduction("鏄�").remark("绀轰緥").build());
- ExcelUtils.write(response, "閿�鍞鍗曞鍏ユā鏉�.xls", "閿�鍞鍗�", ErpSaleOrderImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閿�鍞鍗曞鍏ユā鏉�.xls", "閿�鍞鍗�", ErpSaleOrderImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 735cc69..a3c4e7d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -224,7 +224,7 @@
.remark("绀轰緥鏁版嵁")
.build()
);
- ExcelUtils.write(response, "鑰冨嫟瀵煎叆妯℃澘.xls", "鑰冨嫟璁板綍", HrmAttendanceRecordImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鑰冨嫟瀵煎叆妯℃澘.xls", "鑰冨嫟璁板綍", HrmAttendanceRecordImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java
index 0530349..a5bdf2d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeContractController.java
@@ -105,7 +105,7 @@
.probationSalary(new BigDecimal("8000.00")).regularSalary(new BigDecimal("10000.00"))
.remark("绀轰緥锛氳鎸夊疄闄呬慨鏀瑰悗瀵煎叆").build()
);
- ExcelUtils.write(response, "鍛樺伐鍚堝悓瀵煎叆妯℃澘.xls", "鍛樺伐鍚堝悓", HrmEmployeeContractImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍛樺伐鍚堝悓瀵煎叆妯℃澘.xls", "鍛樺伐鍚堝悓", HrmEmployeeContractImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
index 4d4829a..3684571 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/HrmEmployeeController.java
@@ -201,16 +201,28 @@
@Operation(summary = "涓嬭浇鍛樺伐瀵煎叆妯℃澘")
@PreAuthorize("@ss.hasPermission('hrm:employee:import')")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 杈撳嚭绀轰緥鏁版嵁锛屾柟渚夸娇鐢ㄨ�呭弬鑰�
+ // 绀轰緥鐨勯儴闂�/宀椾綅/瑙掕壊鍙栧綋鍓嶇郴缁熺湡瀹炴暟鎹紝閬垮厤鐓ф妱 demo 閲岀殑銆岀爺鍙戦儴銆嶅鑷村尮閰嶅け璐�
+ String sampleDept = "璇峰~鍐欓儴闂ㄥ悕绉�";
+ try {
+ var depts = deptApi.getDeptList();
+ if (depts != null && !depts.isEmpty()) {
+ sampleDept = depts.get(0).getName();
+ }
+ } catch (Exception ignored) {
+ // 鍙栦笉鍒板氨淇濈暀鍗犱綅鏂囨锛屼笉褰卞搷妯℃澘涓嬭浇
+ }
+ // 宀椾綅鏈彁渚涚畝鏄撳垪琛� API锛岀ず渚嬬敤鍗犱綅鏂囨
+ String samplePost = "璇峰~鍐欏矖浣嶅悕绉帮紙澶氫釜鐢ㄨ嫳鏂囬�楀彿鍒嗛殧锛�";
+
List<HrmEmployeeImportExcelVO> list = Arrays.asList(
HrmEmployeeImportExcelVO.builder().name("寮犱笁").gender(1).phone("13800138000")
- .deptName("鐮斿彂閮�").postName("閮ㄩ棬缁忕悊,椤圭洰缁忕悊").roleNames("鏅�氱鐞嗗憳")
+ .deptName(sampleDept).postName(samplePost).roleNames("鏅�氳鑹�")
.hireDate(LocalDate.of(2020, 3, 1)).employeeStatus(1)
.idCard("320102199001150011").birthday(LocalDate.of(1990, 1, 15))
.nation("姹夋棌").marriageStatus("宸插").age(36).education("鏈").politicalStatus("涓叡鍏氬憳")
- .email("zhangsan@example.com").build()
+ .email("zhangsan@example.com").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�").build()
);
- ExcelUtils.write(response, "鍛樺伐瀵煎叆妯℃澘.xls", "鍛樺伐鍒楄〃", HrmEmployeeImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍛樺伐瀵煎叆妯℃澘.xls", "鍛樺伐鍒楄〃", HrmEmployeeImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
index b570ded..b056875 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
@@ -17,6 +17,7 @@
import cn.iocoder.yudao.module.mdm.dal.dataobject.category.MdmItemCategoryDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemDO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasurePageReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
import cn.iocoder.yudao.module.mdm.enums.MdmItemTypeEnum;
import cn.iocoder.yudao.module.mdm.service.brand.MdmBrandService;
@@ -318,10 +319,38 @@
@Operation(summary = "鑾峰緱瀵煎叆鐗╂枡妯℃澘")
@PreAuthorize("@ss.hasPermission('mdm:item:import')")
public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鍒嗙被缂栫爜銆佽閲忓崟浣嶇紪鐮佷负蹇呭~椤癸紝绀轰緥鍙栧綋鍓嶇郴缁熺湡瀹炵紪鐮侊紝閬垮厤鐓фā鏉垮鍏ョ洿鎺ュけ璐�
+ String sampleCategoryCode = "";
+ try {
+ List<MdmItemCategoryDO> cats = itemCategoryService.getSimpleItemList();
+ if (cats != null && !cats.isEmpty()) {
+ sampleCategoryCode = cats.get(0).getCode();
+ }
+ } catch (Exception ignored) {
+ // 鍙栦笉鍒扮暀绌猴紝涓嶅奖鍝嶆ā鏉夸笅杞�
+ }
+ String sampleUnitCode = "";
+ try {
+ MdmUnitMeasurePageReqVO unitReq = new MdmUnitMeasurePageReqVO();
+ unitReq.setPageNo(1);
+ unitReq.setPageSize(1);
+ List<MdmUnitMeasureDO> units = unitMeasureService.getUnitMeasurePage(unitReq).getList();
+ if (units != null && !units.isEmpty()) {
+ sampleUnitCode = units.get(0).getCode();
+ }
+ } catch (Exception ignored) {
+ // 鍚屼笂
+ }
+
List<MdmItemImportExcelVO> list = Arrays.asList(
- MdmItemImportExcelVO.builder().code("ITEM001").name("绀轰緥鐗╂枡").specification("瑙勬牸").status(0).isBatchManaged(false).build()
+ MdmItemImportExcelVO.builder()
+ .code("ITEM-EXAMPLE").name("绀轰緥鐗╂枡锛堣鏇挎崲锛�").specification("瑙勬牸")
+ .categoryCode(sampleCategoryCode).unitMeasureCode(sampleUnitCode)
+ .status(0).isBatchManaged(false)
+ .remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹紱鍒嗙被缂栫爜/鍗曚綅缂栫爜璇峰~鍐欑郴缁熶腑宸插瓨鍦ㄧ殑缂栫爜")
+ .build()
);
- ExcelUtils.write(response, "鐗╂枡瀵煎叆妯℃澘.xls", "鐗╂枡", MdmItemImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐗╂枡瀵煎叆妯℃澘.xls", "鐗╂枡", MdmItemImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
index fded63a..2b85f84 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
@@ -144,7 +144,7 @@
MdmUnitMeasureImportExcelVO.builder().code("PC").name("鐗�").primaryFlag(true).changeRate(new java.math.BigDecimal("1")).status(0).remark("绀轰緥锛氫富鍗曚綅").build(),
MdmUnitMeasureImportExcelVO.builder().code("XIA").name("绠�").primaryFlag(false).primaryCode("PC").changeRate(new java.math.BigDecimal("100")).status(0).remark("绀轰緥锛�1绠�=100鐗�").build()
);
- ExcelUtils.write(response, "璁¢噺鍗曚綅瀵煎叆妯℃澘.xls", "璁¢噺鍗曚綅", MdmUnitMeasureImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁¢噺鍗曚綅瀵煎叆妯℃澘.xls", "璁¢噺鍗曚綅", MdmUnitMeasureImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
index 864bf15..62d19f7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
@@ -130,7 +130,7 @@
.workshopCode("WS-001").status(0).build()
);
// 杈撳嚭
- ExcelUtils.write(response, "璁惧瀵煎叆妯℃澘.xls", "璁惧鍒楄〃", MesDvMachineryImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁惧瀵煎叆妯℃澘.xls", "璁惧鍒楄〃", MesDvMachineryImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
index 259ea74..66fdb9b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
@@ -123,7 +123,7 @@
.deptName("鐮斿彂閮ㄩ棬").chargeUserName("瓒呯骇绠$悊鍛�")
.checkCycleCount(12).useDate("2026-01-01").status(1).remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
.build());
- ExcelUtils.write(response, "璁¢噺鍣ㄥ叿瀵煎叆妯℃澘.xls", "璁¢噺鍣ㄥ叿", MesDvMeteringImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "璁¢噺鍣ㄥ叿瀵煎叆妯℃澘.xls", "璁¢噺鍣ㄥ叿", MesDvMeteringImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java
index ec014e0..d5744d5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java
@@ -153,7 +153,7 @@
MesMdItemTypeImportExcelVO.builder().code("RAW").name("鍘熸潗鏂�").itemOrProduct("ITEM").sort(1).status(0).remark("绀轰緥锛氶《绾у垎绫�").build(),
MesMdItemTypeImportExcelVO.builder().code("METAL").name("閲戝睘鏉愭枡").parentCode("RAW").itemOrProduct("ITEM").sort(1).status(0).remark("绀轰緥锛氱埗鍒嗙被缂栫爜涓� RAW").build()
);
- ExcelUtils.write(response, "鐗╂枡鍒嗙被瀵煎叆妯℃澘.xls", "鐗╂枡鍒嗙被", MesMdItemTypeImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐗╂枡鍒嗙被瀵煎叆妯℃澘.xls", "鐗╂枡鍒嗙被", MesMdItemTypeImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
index b53f1e2..42af6d8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
@@ -169,7 +169,7 @@
.checkResult("鏍¢獙閫氳繃").inspectorName("").inspectDate("2026-01-01 10:00:00")
.remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
.build());
- ExcelUtils.write(response, "杩囩▼妫�楠屽崟瀵煎叆妯℃澘.xls", "杩囩▼妫�楠�", MesQcIpqcImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "杩囩▼妫�楠屽崟瀵煎叆妯℃澘.xls", "杩囩▼妫�楠�", MesQcIpqcImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
index 7c4e565..44918ce 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
@@ -161,7 +161,7 @@
.inspectDate("2026-01-01 10:00:00").receiveDate("2026-01-01 09:00:00")
.remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
.build());
- ExcelUtils.write(response, "鏉ユ枡妫�楠屽崟瀵煎叆妯℃澘.xls", "鏉ユ枡妫�楠�", MesQcIqcImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鏉ユ枡妫�楠屽崟瀵煎叆妯℃澘.xls", "鏉ユ枡妫�楠�", MesQcIqcImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
index e34e4e2..5573a2f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
@@ -161,7 +161,7 @@
.checkResult("鏍¢獙閫氳繃").inspectorName("").inspectDate("2026-01-01 10:00:00")
.outDate("2026-01-01 09:00:00").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�")
.build());
- ExcelUtils.write(response, "鍑鸿揣妫�楠屽崟瀵煎叆妯℃澘.xls", "鍑鸿揣妫�楠�", MesQcOqcImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍑鸿揣妫�楠屽崟瀵煎叆妯℃澘.xls", "鍑鸿揣妫�楠�", MesQcOqcImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
index a1ee7ca..c4543e4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -148,7 +148,7 @@
.location("A鍖�").area("A-01").batchCode("B20260101").vendor("XX渚涘簲鍟�")
.operationType("瑕嗙洊").quantity(new BigDecimal("100")).build()
);
- ExcelUtils.write(response, "搴撳瓨鐜版湁閲忓鍏ユā鏉�.xls", "搴撳瓨鍒楄〃",
+ ExcelUtils.writeTemplate(response, "搴撳瓨鐜版湁閲忓鍏ユā鏉�.xls", "搴撳瓨鍒楄〃",
MesWmMaterialStockImportExcelVO.class, list);
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
index 85770d4..abd0405 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
@@ -131,7 +131,7 @@
sample.setBankAccount("6222020000000000000");
sample.setStatus(0);
sample.setRemark("瀵煎叆妯℃澘绀轰緥琛岋紝鍙垹闄�");
- ExcelUtils.write(response, "渚涘簲鍟嗗鍏ユā鏉�.xlsx", "渚涘簲鍟�", SrmSupplierImportExcelVO.class, Arrays.asList(sample));
+ ExcelUtils.writeTemplate(response, "渚涘簲鍟嗗鍏ユā鏉�.xlsx", "渚涘簲鍟�", SrmSupplierImportExcelVO.class, Arrays.asList(sample));
}
@PostMapping("/import-excel")
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
index 5e33b96..cc1bdcd 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
@@ -101,11 +101,21 @@
@GetMapping("/get-import-template")
@Operation(summary = "鑾峰緱瀵煎叆閮ㄩ棬妯℃澘")
public void importTemplate(HttpServletResponse response) throws IOException {
+ // 绀轰緥鐨勪笂绾ч儴闂ㄥ彇褰撳墠鐪熷疄鏍归儴闂紝閬垮厤鐓ф妱 demo 閲岀殑銆屾�诲叕鍙搞�嶅鑷存壘涓嶅埌涓婄骇
+ List<DeptDO> allDepts = deptService.getDeptList(new DeptListReqVO());
+ String rootPath = allDepts.stream()
+ .filter(d -> d.getParentId() == null || d.getParentId() == 0)
+ .map(DeptDO::getName)
+ .findFirst()
+ .orElse("璇峰~鍐欎笂绾ч儴闂ㄥ叏璺緞");
+
List<DeptImportExcelVO> list = Arrays.asList(
- DeptImportExcelVO.builder().name("鐮斿彂閮�").parentPath("鎬诲叕鍙�").sort(1).status(CommonStatusEnum.ENABLE.getStatus()).build(),
- DeptImportExcelVO.builder().name("璐㈠姟閮�").parentPath("鎬诲叕鍙�").sort(2).status(CommonStatusEnum.ENABLE.getStatus()).build()
+ DeptImportExcelVO.builder().name("绀轰緥閮ㄩ棬A").parentPath(rootPath).sort(1)
+ .status(CommonStatusEnum.ENABLE.getStatus()).build(),
+ DeptImportExcelVO.builder().name("绀轰緥閮ㄩ棬B").parentPath(rootPath).sort(2)
+ .status(CommonStatusEnum.ENABLE.getStatus()).build()
);
- ExcelUtils.write(response, "閮ㄩ棬瀵煎叆妯℃澘.xls", "閮ㄩ棬鍒楄〃", DeptImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "閮ㄩ棬瀵煎叆妯℃澘.xls", "閮ㄩ棬鍒楄〃", DeptImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
index c98349c..7f088cc 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
@@ -127,7 +127,7 @@
.status(CommonStatusEnum.ENABLE.getStatus()).remark("鍓嶇寮�鍙戝伐绋嬪笀").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "宀椾綅瀵煎叆妯℃澘.xls", "宀椾綅鍒楄〃", PostImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "宀椾綅瀵煎叆妯℃澘.xls", "宀椾綅鍒楄〃", PostImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index c319117..28e113f 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -240,7 +240,7 @@
.mobile("13800000002").nickname("鏉庡洓")
.status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
);
- ExcelUtils.write(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
}
@PostMapping("/import")
diff --git a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
index 68c8510..446281d 100644
--- a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
+++ b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
@@ -11,6 +11,7 @@
import cn.iocoder.yudao.module.infra.api.file.FileApi;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportExcelVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
@@ -422,6 +423,7 @@
o.setMobile(randomMobile());
});
// mock 鏂规硶锛屾ā鎷熷け璐�
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList());
doThrow(new ServiceException(DEPT_NOT_FOUND)).when(deptService).validateDeptList(any());
// 璋冪敤
@@ -445,12 +447,12 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // mock deptService.getDeptList锛氭柊瀹炵幇鎸夈�岄儴闂ㄥ悕绉般�嶅尮閰嶏紝涓嶅啀鎸夌紪鍙锋煡鍗曚釜閮ㄩ棬
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
- when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
+ importUser.setDeptName(dept.getName());
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
// mock passwordEncoder 鐨勬柟娉�
when(passwordEncoder.encode(eq("yudaoyuanma"))).thenReturn("java");
@@ -481,12 +483,12 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // mock deptService.getDeptList锛氭柊瀹炵幇鎸夈�岄儴闂ㄥ悕绉般�嶅尮閰嶏紝涓嶅啀鎸夌紪鍙锋煡鍗曚釜閮ㄩ棬
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
- when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
+ importUser.setDeptName(dept.getName());
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
// 璋冪敤
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), false);
@@ -513,12 +515,12 @@
o.setEmail(randomEmail());
o.setMobile(randomMobile());
});
- // mock deptService 鐨勬柟娉�
+ // mock deptService.getDeptList锛氭柊瀹炵幇鎸夈�岄儴闂ㄥ悕绉般�嶅尮閰嶏紝涓嶅啀鎸夌紪鍙锋煡鍗曚釜閮ㄩ棬
DeptDO dept = randomPojo(DeptDO.class, o -> {
- o.setId(importUser.getDeptId());
o.setStatus(CommonStatusEnum.ENABLE.getStatus());
});
- when(deptService.getDept(eq(dept.getId()))).thenReturn(dept);
+ importUser.setDeptName(dept.getName());
+ when(deptService.getDeptList(any(DeptListReqVO.class))).thenReturn(newArrayList(dept));
// 璋冪敤
UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true);
--
Gitblit v1.9.3