From 90d576d41167dc383b499027c8f5624c7a5c63e0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 17:06:51 +0800
Subject: [PATCH] 骑行时长减免和强制还车
---
server/platform/src/main/java/com/doumee/api/business/ActionLogController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/ActionLogController.java b/server/platform/src/main/java/com/doumee/api/business/ActionLogController.java
index 3f40b12..2fa0f30 100644
--- a/server/platform/src/main/java/com/doumee/api/business/ActionLogController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/ActionLogController.java
@@ -6,7 +6,9 @@
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.ActionLog;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.service.business.ActionLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -73,6 +75,12 @@
public ApiResponse<PageData<ActionLog>> findPage (@RequestBody PageWrap<ActionLog> pageWrap) {
return ApiResponse.success(actionLogService.findPage(pageWrap));
}
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/findRidePae")
+ @RequiresPermissions("business:actionlog:query")
+ public ApiResponse<PageData<ActionLog>> findRidePae (@RequestBody PageWrap<ActionLog> pageWrap) {
+ return ApiResponse.success(actionLogService.findRidePae(pageWrap));
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@@ -80,6 +88,13 @@
public void exportExcel (@RequestBody PageWrap<ActionLog> pageWrap, HttpServletResponse response) {
ExcelExporter.build(ActionLog.class).export(actionLogService.findPage(pageWrap).getRecords(), "绯荤粺琛屼负鎿嶄綔璁板綍琛�", response);
}
+ @ApiOperation("瀵煎嚭璋冩暣璁板綍Excel")
+ @PostMapping("/exportRideExcel")
+ @RequiresPermissions("business:actionlog:exportExcel")
+ public void exportRideExcel (@RequestBody PageWrap<ActionLog> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(ActionLog.class).exportWithFirstAndEnd(actionLogService.findRidePae(pageWrap).getRecords(), "璋冩暣璁板綍_"+System.currentTimeMillis(),"璋冩暣璁板綍_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
--
Gitblit v1.9.3