From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InoutRecordCloudController.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InoutRecordCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InoutRecordCloudController.java
index 4cd362a..3cfc143 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InoutRecordCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InoutRecordCloudController.java
@@ -5,7 +5,10 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.InParkDataDTO;
import com.doumee.dao.business.model.InoutRecord;
+import com.doumee.dao.business.vo.GeneralDataVO;
+import com.doumee.dao.business.vo.InParkUserDataVO;
import com.doumee.service.business.InoutRecordService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
@@ -79,7 +82,7 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:inoutrecord:exportExcel")
public void exportExcel (@RequestBody PageWrap<InoutRecord> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(InoutRecord.class).export(inoutRecordService.findPage(pageWrap).getRecords(), "鍑哄叆鍦轰汉娆¤溅娆℃瘡鏃ョ粺璁¤〃", response);
+ ExcelExporter.build(InoutRecord.class).export(inoutRecordService.findPage(pageWrap).getRecords(), "鍑哄叆鍦轰汉娆¤溅娆＄粺璁¤〃_"+System.currentTimeMillis(), response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -88,4 +91,40 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(inoutRecordService.findById(id));
}
+
+ @ApiOperation("鍩虹鏁版嵁")
+ @PostMapping("/getInParkUserData")
+// @CloudRequiredPermission("business:inoutrecord:query")
+ public ApiResponse<InParkUserDataVO> getInParkUserData (@RequestBody InParkDataDTO inParkDataDTO) {
+ return ApiResponse.success(inoutRecordService.getInParkUserData(inParkDataDTO));
+ }
+
+
+ @ApiOperation("鍗犳瘮鏁版嵁")
+ @PostMapping("/getRataList")
+// @CloudRequiredPermission("business:inoutrecord:query")
+ public ApiResponse<List<GeneralDataVO>> getRataList (@RequestBody InParkDataDTO inParkDataDTO) {
+ return ApiResponse.success(inoutRecordService.getRataList(inParkDataDTO));
+ }
+
+
+ @ApiOperation("鎶ヨ〃鏁版嵁")
+ @PostMapping("/getReportList")
+// @CloudRequiredPermission("business:inoutrecord:query")
+ public ApiResponse<List<List<String>>> getReportList (@RequestBody InParkDataDTO inParkDataDTO) {
+ return ApiResponse.success(inoutRecordService.getReportList(inParkDataDTO));
+ }
+
+
+
+ @ApiOperation("鍏ュ洯鏁版嵁鍒嗘瀽-瀵煎嚭Excel")
+ @PostMapping("/reportExportExcel")
+// @CloudRequiredPermission("business:inoutrecord:query")
+ public void reportExportExcel (@RequestBody InParkDataDTO inParkDataDTO, HttpServletResponse response) {
+ inoutRecordService.excel(inParkDataDTO,response);
+ }
+
+
+
+
}
--
Gitblit v1.9.3