From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
index 6405060..c536cbc 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java
@@ -60,6 +60,7 @@
import org.sxkj.system.param.DeptExportParam;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.service.IDeptService;
+import org.sxkj.system.util.excel.DeptSheetWriteHandler;
import org.sxkj.system.util.excel.RegionSheetWriteHandler;
import org.sxkj.system.vo.DeptVO;
import org.sxkj.system.wrapper.DeptWrapper;
@@ -101,8 +102,8 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入dept")
public R<DeptVO> detail(Dept dept) {
- Dept detail = deptService.getOne(Condition.getQueryWrapper(dept));
- return R.data(DeptWrapper.build().entityVO(detail));
+ DeptVO detail = deptService.getDetailWithAreaName(dept);
+ return R.data(detail);
}
/**
@@ -378,12 +379,21 @@
String fileName = URLEncoder.encode("机构模板", StandardCharsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- // 准备空数据列表
+ // 准备示例数据列表
List<DeptImportExcel> list = new ArrayList<>();
+ // 创建示例数据对象
+ DeptImportExcel example = new DeptImportExcel();
+ // 设置示例数据
+ example.setDeptName("示例机构");
+ example.setAreaCode("360800000000");
+ example.setRemark("这是一个示例机构");
+ example.setStatus("1"); // 假设1表示启用状态
+ // 将示例数据添加到列表
+ list.add(example);
// 使用EasyExcel导出，并注册RegionSheetWriteHandler
EasyExcel.write(response.getOutputStream(), DeptImportExcel.class)
- .registerWriteHandler(new RegionSheetWriteHandler())
+ .registerWriteHandler(new DeptSheetWriteHandler())
.sheet("机构表")
.doWrite(list);
}
--
Gitblit v1.9.3