From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
index bf5d5ef..56cf329 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
@@ -8,12 +8,14 @@
import com.ycl.system.Result;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.group.Update;
+import com.ycl.utils.StringUtils;
import com.ycl.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,7 @@
* @author xp
* @since 2024-03-19
*/
+@Slf4j
@Validated
@RequiredArgsConstructor
@Api(value = "鎶ュ", tags = "鎶ュ绠＄悊")
@@ -124,7 +127,19 @@
public void export(HttpServletResponse response, ReportQuery query)
{
List<ReportVO> list = reportService.export(query);
+ for (ReportVO reportVO : list){
+ if(StringUtils.isBlank(reportVO.getReportContent()) ||"null".equals(reportVO.getReportContent()) ){
+ reportVO.setReportContent("鏆傛棤");
+ }
+ }
ExcelUtil<ReportVO> util = new ExcelUtil<>(ReportVO.class);
util.exportExcel(response, list, "杩愮淮鍗曚綅");
}
+
+ @GetMapping("/list/{gb}")
+ @ApiOperation(value = "鏍规嵁鍥芥爣鐮佹煡鎶ュ", notes = "鏍规嵁鍥芥爣鐮佹煡鎶ュ")
+ public Result getListByGb(@PathVariable("gb") String gb)
+ {
+ return reportService.getListByGb(gb);
+ }
}
--
Gitblit v1.8.0