From 3e456f3e812ead6a19e80cfbdbf86ae0263d50b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 12 七月 2024 22:39:45 +0800
Subject: [PATCH] 完成7.4迭代内容，通过冒烟测试
---
finance-admin/src/main/java/com/finance/web/controller/api/TbDeptController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/finance-admin/src/main/java/com/finance/web/controller/api/TbDeptController.java b/finance-admin/src/main/java/com/finance/web/controller/api/TbDeptController.java
index 4fe02c4..616e3ea 100644
--- a/finance-admin/src/main/java/com/finance/web/controller/api/TbDeptController.java
+++ b/finance-admin/src/main/java/com/finance/web/controller/api/TbDeptController.java
@@ -67,8 +67,8 @@
@ApiOperation("模板下载")
public void download() {
try {
- //ArrayList<TbDept> list = new ArrayList<>();
- //ExcelUtil.exportExcel(list, "部门导入模板", "部门导入模板", TbDept.class, "部门导入模板", response);
+ // ArrayList<TbDept> list = new ArrayList<>();
+ // ExcelUtil.exportExcel(list, "部门导入模板", "部门导入模板", TbDept.class, "部门导入模板", response);
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
@@ -76,7 +76,7 @@
String fileName = URLEncoder.encode("部门导入模板", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
Map<Integer, String[]> selectedMap = new HashMap<>();
- selectedMap.put(3, new String[]{"省本级", "市", "开发区", "县"});
+ selectedMap.put(3, new String[]{"省", "市", "开发区", "县"});
selectedMap.put(4, new String[]{"是", "否"});
EasyExcel.write(response.getOutputStream(), DeptExcel.class).sheet("模板")
.registerWriteHandler(EasyExcelUtil.getStyleStrategy())
@@ -100,7 +100,7 @@
@Transactional(rollbackFor = Exception.class)
public R<Void> importExcel(@RequestPart("file") MultipartFile file) {
try {
- //tbDeptService.importExcel(file);
+ // tbDeptService.importExcel(file);
InputStream inputStream = file.getInputStream();
EasyExcel.read(inputStream, DeptExcel.class, new DeptImportListener(sysUserService))
.sheet().doRead();
--
Gitblit v1.7.1