From c59eeba06fa3ff353cd7c9016aa0a0b25a6931a5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 04 Jan 2024 18:16:06 +0800
Subject: [PATCH] 商超查询，房屋查询，场所查询修改
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 3c0870b..c4de6e3 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.node.TreeStringNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -28,6 +29,8 @@
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.service.IUserHouseLabelService;
+import org.springblade.modules.house.vo.HouseholdLabelVO;
import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.Dept;
@@ -53,7 +56,7 @@
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {
@Autowired
- private IGridService gridService;
+ private IUserHouseLabelService userHouseLabelService;
@Autowired
private IDictBizService dictBizService;
@@ -143,15 +146,8 @@
* @return
*/
@Override
- public boolean saveOrUpdateHousehold(HouseholdEntity household) {
- // 判断添加人是否房屋业主
-// Long count = count(Wrappers.<HouseholdEntity>lambdaQuery()
-// .eq(HouseholdEntity::getHouseCode, household.getHouseCode())
-// .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
-// .eq(HouseholdEntity::getRelationship, 1));
-// if (count == 0) {
-// return false;
-// }
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateHousehold(HouseholdVO household) {
boolean flag = false;
household.setUpdateTime(new Date());
household.setUpdateUser(AuthUtil.getUserId());
@@ -160,6 +156,8 @@
flag = updateById(household);
// 更新用户信息
updateUserInfo(household);
+ // 更新标签信息
+ updateUserLabelInfo(household);
} else {
// 新增
household.setCreateTime(new Date());
@@ -167,8 +165,28 @@
flag = save(household);
// 更新用户信息
updateUserInfo(household);
+ // 更新标签信息
+ updateUserLabelInfo(household);
}
return flag;
+ }
+
+ /**
+ * 更新用户标签信息
+ * @param household
+ */
+ public void updateUserLabelInfo(HouseholdVO household) {
+ if (household.getHouseholdLabelList().size()>0){
+ List<HouseholdLabelVO> householdLabelList = household.getHouseholdLabelList();
+ for (HouseholdLabelVO householdLabelVO : householdLabelList) {
+ if (!Strings.isBlank(household.getHouseCode())) {
+ householdLabelVO.setHouseCode(household.getHouseCode());
+ }
+ householdLabelVO.setHouseholdId(household.getId());
+ // 先删除对应绑定的信息
+ userHouseLabelService.saveOrUpdateHouseholdLabel(householdLabelVO);
+ }
+ }
}
/**
@@ -195,6 +213,12 @@
User userParams = new User();
userParams.setPhone(householdEntity.getPhoneNumber());
User user = userService.getOne(Condition.getQueryWrapper(userParams));
+ if (null==user) {
+ User userParams1 = new User();
+ userParams1.setAccount(householdEntity.getPhoneNumber());
+ userParams1.setIsDeleted(0);
+ user = userService.getOne(Condition.getQueryWrapper(userParams1));
+ }
if (null!=user) {
//如果用户存在，则该用户id绑定场所
householdEntity.setAssociatedUserId(user.getId());
--
Gitblit v1.9.3