Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ public void batchDelete(@RequestBody @Valid IdsReq req) {
@ExcludeFromGracefulResponse
@Operation(summary = "导出数据", description = "导出数据")
@GetMapping("/export")
public void export(@Valid Q query, @Valid SortQuery sortQuery, HttpServletResponse response) {
baseService.export(query, sortQuery, response);
public void export(@Valid Q query, @Valid SortQuery sortQuery, String fileName, HttpServletResponse response) {
baseService.export(query, sortQuery, fileName, response);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,10 @@ public interface CrudService<L, D, Q, C> {
*
* @param query 查询条件
* @param sortQuery 排序查询条件
* @param fileName 导出的文件名称
* @param response 响应对象
*/
void export(@Valid Q query, @Valid SortQuery sortQuery, HttpServletResponse response);
void export(@Valid Q query, @Valid SortQuery sortQuery, String fileName, HttpServletResponse response);

/**
* 查询字典列表
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,16 @@ public void delete(List<Long> ids) {
}

@Override
public void export(Q query, SortQuery sortQuery, HttpServletResponse response) {
public void export(Q query, SortQuery sortQuery, String fileName, HttpServletResponse response) {
List<D> list = this.list(query, sortQuery, detailClass);
list.forEach(this::fill);
ExcelUtils.export(list, "导出数据", detailClass, response);
if (fileName == null) {
fileName = "导出数据";
}
if (fileName.endsWith(".xlsx")) {
fileName = fileName.substring(0, fileName.length() - 5);
}
ExcelUtils.export(list, fileName, detailClass, response);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,16 @@ public void delete(List<Long> ids) {
}

@Override
public void export(Q query, SortQuery sortQuery, HttpServletResponse response) {
public void export(Q query, SortQuery sortQuery, String fileName, HttpServletResponse response) {
List<D> list = this.list(query, sortQuery, this.getDetailClass());
list.forEach(this::fill);
ExcelUtils.export(list, "导出数据", this.getDetailClass(), response);
if (fileName == null) {
fileName = "导出数据";
}
if (fileName.endsWith(".xlsx")) {
fileName = fileName.substring(0, fileName.length() - 5);
}
ExcelUtils.export(list, fileName, this.getDetailClass(), response);
}

@Override
Expand Down
Loading