From 1c8fc3df880a10625fe8326af8d6442d8f90f398 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 09 Dec 2023 13:29:18 +0800
Subject: [PATCH] 出租人员信息完善

---
 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index e6bca35..f3ee606 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -20,6 +20,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.utils.IdUtils;
 import org.springblade.common.utils.NodeTreeUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -162,7 +163,7 @@
 	 * @param houseAndHoldExcel
 	 */
 	@Transactional(rollbackFor = Exception.class)
-	public void saveHouseholdData(HouseAndHoldExcel houseAndHoldExcel) {
+	public void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
 		// 查询库中是否已存在
 		QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq("house_code",houseAndHoldExcel.getHouseCode())
@@ -188,6 +189,12 @@
 			houseEntity.setCreateUser(AuthUtil.getUserId().toString());
 			houseEntity.setUpdateTime(new Date());
 			houseEntity.setUpdateUser(AuthUtil.getUserId().toString());
+			if (!Strings.isBlank(houseAndHoldExcel.getHouseCode())) {
+				houseEntity.setSource(1);
+			}else {
+				houseEntity.setHouseCode(IdUtils.getIdBy36());
+				houseEntity.setSource(2);
+			}
 			// 新增
 			save(houseEntity);
 		}
@@ -198,7 +205,7 @@
 	 * @param houseAndHoldExcel
 	 */
 	@Transactional(rollbackFor = Exception.class)
-	public void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
+	public void saveHouseholdData(HouseAndHoldExcel houseAndHoldExcel) {
 		// 查询库中是否已存在
 		QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq("house_code",houseAndHoldExcel.getHouseCode())

--
Gitblit v1.9.3