From 7cdbc90a2bcab9123bf4a2f026b6ba1edec8b78b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 11:23:37 +0800
Subject: [PATCH] 注释过滤
---
src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java b/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
index 6d56362..74e4650 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
@@ -22,14 +22,21 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.house.excel.HouseExcel;
+import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO;
+import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
+import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
@@ -178,8 +185,19 @@
@PostMapping("/rectificationStatistics")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "九小场所类型隐患数量统计", notes = "传入taskPlaceRectification")
- public R rectificationStatistics() {
- return R.data(taskPlaceRectificationService.rectificationStatistics());
+ public R rectificationStatistics(@Valid @RequestBody TaskPlaceRectificationVO taskPlaceRectification) {
+ return R.data(taskPlaceRectificationService.rectificationStatistics(taskPlaceRectification));
+ }
+
+ /**
+ * 导出房屋
+ */
+ @GetMapping("exportRectificationStatistics")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "导出整改统计", notes = "传入user")
+ public void exportHouse(TaskPlaceRectificationsVO taskPlaceRectificationVO, HttpServletResponse response) {
+ List<TaskPlaceRectificationExcel> list = taskPlaceRectificationService.export(taskPlaceRectificationVO);
+ ExcelUtil.export(response, "整改数据" + DateUtil.time(), "场所数据表", list, TaskPlaceRectificationExcel.class);
}
--
Gitblit v1.9.3