From be4bfd2dac75cf4249ef30f85c4fbb07d0dcc67f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 24 十月 2023 18:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java b/server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java
index fab238d..567a2d9 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BikeRepairController.java
@@ -7,6 +7,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BikeRepair;
+import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.business.web.request.BikeRepairDTO;
+import com.doumee.dao.business.web.request.BikeRepairQuery;
import com.doumee.service.business.BikeRepairService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -67,18 +70,24 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("鍧忚溅涓婃姤_鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:bikerepair:query")
- public ApiResponse<PageData<BikeRepair>> findPage (@RequestBody PageWrap<BikeRepair> pageWrap) {
+ public ApiResponse<PageData<BikeRepairDTO>> findPage (@RequestBody PageWrap<BikeRepairQuery> pageWrap) {
return ApiResponse.success(bikeRepairService.findPage(pageWrap));
+ }
+ @ApiOperation("鍧忚溅涓婃姤_鏌ヨ闂闄勪欢鍒楄〃")
+ @GetMapping("/getFileList/{id}")
+ @RequiresPermissions("business:bikerepair:query")
+ public ApiResponse<List<Multifile>> getFileList (@PathVariable String id) {
+ return ApiResponse.success(bikeRepairService.getBikeRepairProblemDTO(id));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:bikerepair:exportExcel")
- public void exportExcel (@RequestBody PageWrap<BikeRepair> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(BikeRepair.class).export(bikeRepairService.findPage(pageWrap).getRecords(), "杞﹁締闂涓婃姤淇℃伅琛�", response);
+ public void exportExcel (@RequestBody PageWrap<BikeRepairQuery> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(BikeRepairDTO.class).export(bikeRepairService.findPage(pageWrap).getRecords(), "杞﹁締闂涓婃姤淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
--
Gitblit v1.9.3