From 080edcadaec99063016531f1aa3e623b062d3c9b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 15:22:32 +0800
Subject: [PATCH] 骑行记录表优化和导出
---
server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java b/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
index 05fd57f..b851e02 100644
--- a/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java
@@ -6,7 +6,12 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
+import com.doumee.dao.business.web.request.MemberRidesQuery;
+import com.doumee.dao.business.web.response.BikeLogDTO;
+import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.service.business.MemberRidesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -70,15 +75,28 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:memberrides:query")
- public ApiResponse<PageData<MemberRides>> findPage (@RequestBody PageWrap<MemberRides> pageWrap) {
+ public ApiResponse<PageData<MemberRidesDTO>> findPage (@RequestBody PageWrap<MemberRidesQuery> pageWrap) {
return ApiResponse.success(memberRidesService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:memberrides:exportExcel")
- public void exportExcel (@RequestBody PageWrap<MemberRides> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(MemberRides.class).export(memberRidesService.findPage(pageWrap).getRecords(), "鐢ㄦ埛楠戣璁板綍琛�", response);
+ public void exportExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(MemberRidesDTO.class).export(memberRidesService.findPage(pageWrap).getRecords(), "鐢ㄦ埛楠戣璁板綍琛�", response);
+ }
+
+ @ApiOperation("鐢ㄦ埛楠戣璁板綍瀵煎嚭excel")
+ @PostMapping("/exportMemberRidesExcel")
+ @RequiresPermissions("business:memberrides:exportExcel")
+ public void exportMemberRidesExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(MemberRidesDTO.class).exportWithFirstAndEnd(memberRidesService.findPage(pageWrap).getRecords(),"鐢ㄦ埛楠戣璁板綍_"+System.currentTimeMillis(),"鐢ㄦ埛楠戣璁板綍_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+ }
+ @ApiOperation("杞﹁締鍙栬繕璁板綍瀵煎嚭excel")
+ @PostMapping("/exportBikeLogExcel")
+ @RequiresPermissions("business:memberrides:exportExcel")
+ public void exportBikeLogExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(BikeLogDTO.class).exportWithFirstAndEnd(memberRidesService.findBikeLog(pageWrap).getRecords(),"杞﹁締鍙栬繕璁板綍_"+System.currentTimeMillis(),"杞﹁締鍙栬繕璁板綍_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
--
Gitblit v1.9.3