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-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
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 7a243b7..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
@@ -7,17 +7,25 @@
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptImportRespVO;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -90,4 +98,37 @@
return success(BeanUtils.toBean(dept, DeptRespVO.class));
}
+ @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("绀轰緥閮ㄩ棬A").parentPath(rootPath).sort(1)
+ .status(CommonStatusEnum.ENABLE.getStatus()).build(),
+ DeptImportExcelVO.builder().name("绀轰緥閮ㄩ棬B").parentPath(rootPath).sort(2)
+ .status(CommonStatusEnum.ENABLE.getStatus()).build()
+ );
+ ExcelUtils.writeTemplate(response, "閮ㄩ棬瀵煎叆妯℃澘.xls", "閮ㄩ棬鍒楄〃", DeptImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閮ㄩ棬")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('system:dept:import')")
+ public CommonResult<DeptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<DeptImportExcelVO> list = ExcelUtils.read(file, DeptImportExcelVO.class);
+ return success(deptService.importDeptList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3