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 | 73 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 21 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 2f07121..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
@@ -1,28 +1,26 @@
package com.ycl.platform.controller;
-import com.ycl.platform.domain.entity.Report;
-import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.form.ReportAuditingForm;
-import com.ycl.platform.domain.vo.ReportVO;
-import com.ycl.platform.domain.vo.TMonitorVO;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
-import com.ycl.utils.poi.ExcelUtil;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.platform.service.ReportService;
-import com.ycl.system.Result;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
+import com.ycl.platform.domain.vo.ReportVO;
+import com.ycl.platform.service.ReportService;
+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.*;
+
+import java.util.List;
/**
* 鎶ュ 鍓嶇鎺у埗鍣�
@@ -30,6 +28,7 @@
* @author xp
* @since 2024-03-19
*/
+@Slf4j
@Validated
@RequiredArgsConstructor
@Api(value = "鎶ュ", tags = "鎶ュ绠＄悊")
@@ -44,6 +43,26 @@
@PreAuthorize("@ss.hasPermi('system:report:add')")
public Result add(@RequestBody @Validated(Add.class) ReportForm form) {
return reportService.add(form);
+ }
+
+ @PostMapping("/import")
+ @ApiOperation(value = "瀵煎叆", notes = "瀵煎叆")
+ @PreAuthorize("@ss.hasPermi('system:report:add')")
+ public Result importData(ReportForm form) {
+ return reportService.importData(form);
+ }
+
+ @GetMapping("/getTogether/{pid}")
+ @ApiOperation(value = "鑾峰彇鍚屼竴鎵规鐨勬姤澶�", notes = "鑾峰彇鍚屼竴鎵规鐨勬姤澶�")
+ public Result getTogether(@PathVariable("pid") String pid) {
+ return reportService.getTogether(pid);
+ }
+
+ @PostMapping("/importTemplate")
+ @ApiOperation(value = "瀵煎叆妯℃澘", notes = "瀵煎叆妯℃澘")
+ @PreAuthorize("@ss.hasPermi('system:report:add')")
+ public void importTemplate(HttpServletResponse response) {
+ reportService.importTemplate(response);
}
@PutMapping
@@ -88,11 +107,11 @@
return reportService.all();
}
- @GetMapping("/examine/record")
+ @GetMapping("/auditing/record/{id}")
@ApiOperation(value = "瀹℃牳璁板綍", notes = "瀹℃牳璁板綍")
@PreAuthorize("@ss.hasPermi('system:report:record')")
- public Result examineRecord() {
- return reportService.examineRecord();
+ public Result auditingRecord(@PathVariable("id") Integer id) {
+ return reportService.auditingRecord(id);
}
@PostMapping("/auditing")
@@ -108,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