From 858ddcd71b737c1e2d9f9c1fb9d009209cb97b4e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 22 Feb 2024 16:47:26 +0800
Subject: [PATCH] 场所检查新增场所类型查询，安全自查查询调整，新增安全自查导出
---
src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 d7097ec..97b22bd 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
@@ -32,9 +32,15 @@
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.HouseAndHoldExcel;
+import org.springblade.modules.house.excel.HouseAndHoldImporter;
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.PlaceRectificationsExcel;
+import org.springblade.modules.taskPlaceRectification.excel.PlaceRectificationsImporter;
+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;
@@ -42,6 +48,7 @@
import org.springblade.modules.taskPlaceRectification.wrapper.TaskPlaceRectificationWrapper;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -180,11 +187,11 @@
/**
* 民警审核
*/
- @GetMapping("/rectificationStatistics")
+ @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));
}
/**
@@ -193,9 +200,19 @@
@GetMapping("exportRectificationStatistics")
@ApiOperationSupport(order = 13)
@ApiOperation(value = "导出整改统计", notes = "传入user")
- public void exportHouse(TaskPlaceRectificationVO taskPlaceRectificationVO, HttpServletResponse response) {
- List<HouseExcel> list = taskPlaceRectificationService.export(taskPlaceRectificationVO);
- ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, HouseExcel.class);
+ public void exportHouse(TaskPlaceRectificationsVO taskPlaceRectificationVO, HttpServletResponse response) {
+ List<TaskPlaceRectificationExcel> list = taskPlaceRectificationService.export(taskPlaceRectificationVO);
+ ExcelUtil.export(response, "整改数据" + DateUtil.time(), "场所数据表", list, TaskPlaceRectificationExcel.class);
+ }
+
+ /**
+ * 导入房屋及住户/租户人员数据
+ */
+ @PostMapping("import-placeRectifications")
+ public R importPlaceRectifications(MultipartFile file, Integer isCovered) {
+ PlaceRectificationsImporter placeRectificationsImporter = new PlaceRectificationsImporter(taskPlaceRectificationService, isCovered == 1);
+ ExcelUtil.save(file, placeRectificationsImporter, PlaceRectificationsExcel.class);
+ return R.success("操作成功");
}
--
Gitblit v1.9.3