From 9527c95734ef23f27075970f1312cfc854c04b10 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Mon, 2 Oct 2023 16:44:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E2=80=9C=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E7=AE=A1=E7=90=86=E2=80=9D-=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA-=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9A=E8=AF=B7=E6=B1=82=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAget=EF=BC=8C=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9=E4=B8=BA/excel=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BE=9B=E6=96=B9=E6=B3=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=8D=E5=88=86=E9=A1=B5=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysPostController.java | 17 ++++++++++++----- .../system/post/PostApplicationService.java | 17 +++++++++++++++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java index 7c2271e..57db06b 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java @@ -1,8 +1,10 @@ package com.agileboot.admin.controller.system; +import com.agileboot.admin.customize.aop.accessLog.AccessLog; import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; +import com.agileboot.common.enums.common.BusinessTypeEnum; import com.agileboot.common.utils.poi.CustomExcelUtil; import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.post.PostApplicationService; @@ -10,8 +12,6 @@ import com.agileboot.domain.system.post.command.AddPostCommand; import com.agileboot.domain.system.post.command.UpdatePostCommand; import com.agileboot.domain.system.post.dto.PostDTO; import com.agileboot.domain.system.post.query.PostQuery; -import com.agileboot.admin.customize.aop.accessLog.AccessLog; -import com.agileboot.common.enums.common.BusinessTypeEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.util.List; @@ -53,13 +53,20 @@ public class SysPostController extends BaseController { return ResponseDTO.ok(pageDTO); } + /** + * + * @param response http响应 + * @param query 查询参数 + * @author Kevin Zhang + * @date 2023-10-02 + */ @Operation(summary = "职位列表导出") @AccessLog(title = "岗位管理", businessType = BusinessTypeEnum.EXPORT) @PreAuthorize("@permission.has('system:post:export')") - @PostMapping("/export") + @GetMapping("/excel") public void export(HttpServletResponse response, PostQuery query) { - PageDTO pageDTO = postApplicationService.getPostList(query); - CustomExcelUtil.writeToResponse(pageDTO.getRows(), PostDTO.class, response); + List all = postApplicationService.getPostListAll(query); + CustomExcelUtil.writeToResponse(all, PostDTO.class, response); } /** diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java index 70846bc..f4c8ac2 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java @@ -4,12 +4,12 @@ import com.agileboot.common.core.page.PageDTO; import com.agileboot.domain.common.command.BulkOperationCommand; import com.agileboot.domain.system.post.command.AddPostCommand; import com.agileboot.domain.system.post.command.UpdatePostCommand; +import com.agileboot.domain.system.post.db.SysPostEntity; +import com.agileboot.domain.system.post.db.SysPostService; import com.agileboot.domain.system.post.dto.PostDTO; import com.agileboot.domain.system.post.model.PostModel; import com.agileboot.domain.system.post.model.PostModelFactory; import com.agileboot.domain.system.post.query.PostQuery; -import com.agileboot.domain.system.post.db.SysPostEntity; -import com.agileboot.domain.system.post.db.SysPostService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; import java.util.stream.Collectors; @@ -33,6 +33,19 @@ public class PostApplicationService { return new PageDTO<>(records, page.getTotal()); } + /** + * 查询满足条件的所有岗位，不分页 + * @param query 查询条件 + * @return 满足查询条件的岗位列表 + * @author Kevin Zhang + * @date 2023-10-02 + */ + public List getPostListAll(PostQuery query) { + List all = postService.list(query.toQueryWrapper()); + List records = all.stream().map(PostDTO::new).collect(Collectors.toList()); + return records; + } + public PostDTO getPostInfo(Long postId) { SysPostEntity byId = postService.getById(postId); return new PostDTO(byId); From a6344a2662b7894265b9a3c68aec95d3fe8a9d6e Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Mon, 2 Oct 2023 16:53:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E2=80=9C=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E7=AE=A1=E7=90=86=E2=80=9D-=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA-=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9A=E8=AF=B7=E6=B1=82=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAget=EF=BC=8C=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9=E4=B8=BA/excel=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BE=9B=E6=96=B9=E6=B3=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=8D=E5=88=86=E9=A1=B5=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agileboot/admin/controller/system/SysPostController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java index 57db06b..60526b0 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java @@ -54,7 +54,7 @@ public class SysPostController extends BaseController { } /** - * + * 导出查询到的所有岗位信息到excel文件 * @param response http响应 * @param query 查询参数 * @author Kevin Zhang