From 68391d116c907879b94b7ec4c55bc4ce0c5ca63a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 05 二月 2024 10:03:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java b/server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java
index b82980d..b2bdb4d 100644
--- a/server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.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.ApplyChagneDetail;
import com.doumee.service.business.ApplyChagneDetailService;
import io.swagger.annotations.Api;
@@ -66,21 +67,27 @@
applyChagneDetailService.updateById(applyChagneDetail);
return ApiResponse.success(null);
}
+//
+@ApiOperation("鍒嗛〉鏌ヨ")
+@PostMapping("/page")
+@RequiresPermissions("business:applychagnedetail:query")
+public ApiResponse<PageData<ApplyChagneDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
+ return ApiResponse.success(applyChagneDetailService.findPageForCompany(pageWrap));
+}
@ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
+ @PostMapping("/list")
@RequiresPermissions("business:applychagnedetail:query")
- public ApiResponse<PageData<ApplyChagneDetail>> findPage (@RequestBody PageWrap<ApplyChagneDetail> pageWrap) {
- return ApiResponse.success(applyChagneDetailService.findPage(pageWrap));
+ public ApiResponse<List<ApplyChagneDetail>> findList (@RequestBody ApplyChagneDetail pageWrap) {
+ return ApiResponse.success(applyChagneDetailService.findList(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:applychagnedetail:exportExcel")
- public void exportExcel (@RequestBody PageWrap<ApplyChagneDetail> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(ApplyChagneDetail.class).export(applyChagneDetailService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇锋槑缁嗕俊鎭〃", response);
- }
+ public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) {
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:applychagnedetail:query")
--
Gitblit v1.9.3