From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 02 四月 2024 17:05:57 +0800 Subject: [PATCH] mrshi --- server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java b/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java index 8699678..57780fc 100644 --- a/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java +++ b/server/platform/src/main/java/com/doumee/api/business/ApplyDetailController.java @@ -6,6 +6,7 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; +import com.doumee.dao.business.dto.ApplyDetailPageDTO; import com.doumee.dao.business.model.ApplyDetail; import com.doumee.service.business.ApplyDetailService; import io.swagger.annotations.Api; @@ -66,19 +67,24 @@ applyDetailService.updateById(applyDetail); return ApiResponse.success(null); } - @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") @RequiresPermissions("business:applydetail:query") - public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetail> pageWrap) { - return ApiResponse.success(applyDetailService.findPage(pageWrap)); + public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) { + return ApiResponse.success(applyDetailService.findPageForCompany(pageWrap)); } - - @ApiOperation("瀵煎嚭Excel") + @ApiOperation("鏌ヨ鍏ㄩ儴") + @PostMapping("/list") + @RequiresPermissions("business:applydetail:query") + public ApiResponse<List<ApplyDetail>> findList (@RequestBody ApplyDetail pageWrap) { + return ApiResponse.success(applyDetailService.findList(pageWrap)); + } + @ApiOperation("瀵煎嚭鍦ㄤ繚浜哄憳璇﹀崟Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:applydetail:exportExcel") - public void exportExcel (@RequestBody PageWrap<ApplyDetail> pageWrap, HttpServletResponse response) { - ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPage(pageWrap).getRecords(), "鎶曚繚鐢宠鏄庣粏淇℃伅琛�", response); + public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) { + ExcelExporter.build(ApplyDetail.class).exportWithFirstAndEnd(applyDetailService.findPageForCompany(pageWrap).getRecords(), + pageWrap.getModel().getSolutionName(),"鍦ㄤ繚浜哄憳鍚嶅崟",null, response); } @ApiOperation("鏍规嵁ID鏌ヨ") -- Gitblit v1.9.3