From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
index 89cc65b..0836db5 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -40,6 +40,7 @@
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.excel.ImportTenantHouseholdExcel;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.vo.AddHouseholdVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
import org.springframework.transaction.annotation.Transactional;
@@ -201,6 +202,23 @@
return R.status(householdService.saveOrUpdateHousehold(household));
}
+
+ /**
+ * 批量自定义新增或修改
+ *
+ * @param addHouseholdVO
+ * @return
+ */
+ @PostMapping("/saveOrUpdateHouseholdBatch")
+ @ApiLog("批量自定义新增或修改")
+ @ApiOperation(value = "批量自定义新增或修改", notes = "传入household")
+ public R saveOrUpdateHouseholdBatch(@Valid @RequestBody AddHouseholdVO addHouseholdVO) {
+ bladeLogger.info("住户信息新增或修改", JsonUtil.toJson(addHouseholdVO));
+ List<HouseholdVO> householdVOList = addHouseholdVO.getHouseholdVOList();
+ boolean result = householdService.saveOrUpdateHouseholdBatch(householdVOList);
+ return R.status(result);
+ }
+
/**
* 住户 删除
*/
@@ -236,7 +254,7 @@
public R importUser(MultipartFile file, Integer isCovered, @RequestParam(value = "isTenant", required = false) String isTenant) {
bladeLogger.info("住户信息导入", JsonUtil.toJson(isCovered));
String data = householdService.importUserHouseHold(ExcelUtil.read(file, ImportHouseholdExcel.class), isCovered == 1, isTenant);
- return R.data(200, data, null);
+ return R.data(200, data, data);
}
/**
--
Gitblit v1.9.3