From 751d072226c4c64f5624f0c8bd2518043a861fc9 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 21 Nov 2023 11:26:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/controller/HouseController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseController.java b/src/main/java/org/springblade/modules/house/controller/HouseController.java
index be0e434..d9c7260 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseController.java
@@ -31,6 +31,8 @@
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.HouseImporter;
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.excel.HouseExcel;
@@ -172,7 +174,7 @@
/**
* 导入房屋
*/
- @GetMapping("import-house")
+ @PostMapping("import-house")
public R importHouse(MultipartFile file, Integer isCovered) {
HouseImporter houseImporter = new HouseImporter(houseService, isCovered == 1);
ExcelUtil.save(file, houseImporter, HouseExcel.class);
@@ -190,4 +192,15 @@
}
+ /**
+ * 导入房屋及住户/租户人员数据
+ */
+ @PostMapping("import-houseAndHold")
+ public R importHouseAndHold(MultipartFile file, Integer isCovered) {
+ HouseAndHoldImporter houseImporter = new HouseAndHoldImporter(houseService, isCovered == 1);
+ ExcelUtil.save(file, houseImporter, HouseAndHoldExcel.class);
+ return R.success("操作成功");
+ }
+
+
}
--
Gitblit v1.9.3