From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/data/DataCountController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataCountController.java b/src/main/java/com/lf/server/controller/data/DataCountController.java
index 1d2ee3a..0c41db0 100644
--- a/src/main/java/com/lf/server/controller/data/DataCountController.java
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -147,10 +147,11 @@
@SysLog()
@ApiOperation(value = "涓嬭浇鎶ュ憡")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "query", example = "18")
+ @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "query", example = "18"),
+ @ApiImplicitParam(name = "code", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00"),
})
@GetMapping(value = "/downloadReport")
- public void downloadReport(Integer id, HttpServletRequest req, HttpServletResponse res) {
+ public void downloadReport(Integer id, String code, HttpServletRequest req, HttpServletResponse res) {
try {
if (null == id || id < 1) {
return;
@@ -163,7 +164,7 @@
UserEntity ue = tokenService.getCurrentUser(req);
- reportService.createReport(ue, re, res);
+ reportService.createReport(ue, re, code, res);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
@@ -417,7 +418,7 @@
}
@SysLog()
- @ApiOperation(value = "鎸夐」鐩粺璁″悇绫绘暟鎹�")
+ @ApiOperation(value = "椤圭洰鏁版嵁鍒嗙被缁熻")
@ApiImplicitParams({
@ApiImplicitParam(name = "code", value = "椤圭洰缂栫爜", dataType = "String", paramType = "query", example = "0B")
})
--
Gitblit v1.9.3