From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
index 94260ab..ee6d5ed 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
@@ -4,9 +4,10 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.vo.RetentionCarsVO;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Retention;
import com.doumee.service.business.RetentionService;
@@ -69,14 +70,26 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- //@CloudRequiredPermission("business:retention:query")
+ @CloudRequiredPermission("business:retention:query")
public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(retentionService.findTrainTimePage(pageWrap));
}
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/pageCars")
+ @CloudRequiredPermission("business:retention:query")
+ public ApiResponse<PageData<RetentionCarsVO>> findPageForCars (@RequestBody PageWrap<RetentionCarsVO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(retentionService.findPageForCars(pageWrap));
+ }
+ @ApiOperation("瀵煎嚭杞﹁締Excel")
+ @PostMapping("/exportExcelCars")
+ @CloudRequiredPermission("business:retention:exportExcel")
+ public void exportExcelCars (@RequestBody PageWrap<RetentionCarsVO> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ ExcelExporter.build(RetentionCarsVO.class).export(retentionService.findPageForCars(pageWrap).getRecords(), "瀹炴椂鍦ㄥ満杞﹁締", response);
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- //@CloudRequiredPermission("business:retention:exportExcel")
+ @CloudRequiredPermission("business:retention:exportExcel")
public void exportExcel (@RequestBody PageWrap<Retention> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
ExcelExporter.build(Retention.class).export(retentionService.findTrainTimePage(pageWrap).getRecords(), "瀹炴椂鍦ㄥ満浜哄憳", response);
}
--
Gitblit v1.9.3