From 54130a901757db72ae1d7c8d20cdfc2123749244 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 25 六月 2025 10:06:09 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1
---
server/platform/src/main/java/com/doumee/api/business/ApplyChagneDetailController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 db2c56a..e2a8eb0 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,26 @@
applyChagneDetailService.updateById(applyChagneDetail);
return ApiResponse.success(null);
}
-//
-// @ApiOperation("鍒嗛〉鏌ヨ")
-// @PostMapping("/page")
-// @RequiresPermissions("business:applychagnedetail:query")
-// public ApiResponse<PageData<ApplyChagneDetail>> findPage (@RequestBody PageWrap<ApplyChagneDetail> pageWrap) {
-// return ApiResponse.success(applyChagneDetailService.findPage(pageWrap));
-// }
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:applychagnedetail:query")
+ public ApiResponse<PageData<ApplyChagneDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
+ return ApiResponse.success(applyChagneDetailService.findPageForCompany(pageWrap));
+ }
-/* @ApiOperation("瀵煎嚭Excel")
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/list")
+ @RequiresPermissions("business:applychagnedetail:query")
+ 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