From 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 14:18:53 +0800
Subject: [PATCH] 文章通过范围查询
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 b1222cc..044969a 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
@@ -17,10 +17,12 @@
package org.springblade.modules.house.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.common.node.TreeNode;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.node.TreeStringNode;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseholdService;
@@ -32,9 +34,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* 住户 服务实现类
@@ -59,7 +59,7 @@
* @return
*/
@Override
- public List<TreeNode> selectHouseNodeList(Long userId) {
+ public List<TreeStringNode> selectHouseNodeList(Long userId) {
return baseMapper.selectHouseNodeList(userId);
}
@@ -115,6 +115,12 @@
// 更新
flag = updateById(household);
}else {
+ // 往用户表中插入数据
+ // 通过手机号判断
+ if (!Strings.isBlank(household.getPhoneNumber())){
+ //判断用户是否存在
+
+ }
// 新增
household.setCreateTime(new Date());
household.setCreateUser(AuthUtil.getUserId());
@@ -158,4 +164,25 @@
public Integer statistics(Long userId) {
return baseMapper.statistics(userId);
}
+
+ /**
+ * 住户对应物业，网格，公安负责人查询
+ * @param household
+ * @return
+ */
+ @Override
+ public Object getHouseholdOtherInfo(HouseholdVO household) {
+ Map<String, Object> map = new HashMap<>(3);
+ // 查询物业
+ HouseholdOtherVO propertyOtherVO = baseMapper.getProperty(household);
+ map.put("wy",propertyOtherVO);
+ // 查询网格
+ HouseholdOtherVO gridOtherVO = baseMapper.getGrid(household);
+ map.put("wg",gridOtherVO);
+ // 查询公安信息
+ HouseholdOtherVO securityOtherVO = baseMapper.getSecurity(household);
+ map.put("ga",securityOtherVO);
+ // 返回
+ return map;
+ }
}
--
Gitblit v1.9.3