From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 190 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 183 insertions(+), 7 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 13561d6..02e8bdb 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
@@ -16,17 +16,28 @@
*/
package org.springblade.modules.house.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.grid.service.IGridService;
+import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseholdEntity;
-import org.springblade.modules.house.vo.HouseholdVO;
+import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseholdService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.house.vo.HouseholdOtherVO;
+import org.springblade.modules.house.vo.HouseholdVO;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.service.IDictBizService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import java.util.*;
/**
* 住户 服务实现类
@@ -37,9 +48,25 @@
@Service
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {
+ @Autowired
+ private IGridService gridService;
+
+ @Autowired
+ private IDictBizService dictBizService;
+
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
- return page.setRecords(baseMapper.selectHouseholdPage(page, household));
+ List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household);
+ // 遍历
+ for (HouseholdVO householdVO : householdVOS) {
+ // 设置对应的网格名称
+ GridVO gridVO = gridService.getGridDetailByHouseCode(householdVO.getHouseCode());
+ if (null!= gridVO){
+ householdVO.setGridName(gridVO.getGridName());
+ }
+ }
+ // 返回
+ return page.setRecords(householdVOS);
}
/**
@@ -48,7 +75,156 @@
* @return
*/
@Override
- public List<TreeNode> selectHouseNodeList(Long userId) {
+ public List<TreeStringNode> selectHouseNodeList(Long userId) {
return baseMapper.selectHouseNodeList(userId);
}
+
+ /**
+ * 查询房屋人员情况
+ * @param code
+ * @return
+ */
+ @Override
+ public List<HouseholdVO> getHouseholdListByCode(String code) {
+ // 查询
+ List<HouseholdVO> householdList = baseMapper.getHouseholdListByCode(code);
+ // 处理字典
+ handleDictBiz(householdList);
+ // 返回
+ return householdList;
+ }
+
+ /**
+ * 处理字典
+ * @param householdList
+ */
+ private void handleDictBiz(List<HouseholdVO> householdList) {
+ if (householdList.size()>0){
+ // 查询角色关系字典
+ List<DictBiz> dictBizList = dictBizService.getList("roleRelation");
+ if (dictBizList.size()>0) {
+ // 遍历
+ for (HouseholdVO householdVO : householdList) {
+ if (null != householdVO.getRelationship()) {
+ for (DictBiz dictBiz : dictBizList) {
+ if (householdVO.getRelationship().toString().equals(dictBiz.getDictKey())) {
+ householdVO.setRoleRelationName(dictBiz.getDictValue());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 住户 自定义新增或修改
+ * @param household
+ * @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;
+ }
+ boolean flag = false;
+ household.setUpdateTime(new Date());
+ household.setUpdateUser(AuthUtil.getUserId());
+ if (null != household.getId()) {
+ // 更新
+ flag = updateById(household);
+ } else {
+ // 往用户表中插入数据
+ // 通过手机号判断
+ if (!Strings.isBlank(household.getPhoneNumber())) {
+ //判断用户是否存在
+ }
+ // 新增
+ household.setCreateTime(new Date());
+ household.setCreateUser(AuthUtil.getUserId());
+ flag = save(household);
+ }
+ return flag;
+ }
+
+ /**
+ * 住户 自定义查询详情
+ * @param household
+ * @return
+ */
+ @Override
+ public Object getDetail(HouseholdEntity household) {
+ return baseMapper.getHouseholdListById(household);
+ }
+
+ @Override
+ public List<HouseHoldExcel> export(HouseholdVO household) {
+ List<HouseHoldExcel> userHouseHoldExcels = baseMapper.export(household);
+ return userHouseHoldExcels;
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered) {
+ data.forEach(houseHoldExcel -> {
+ HouseholdEntity houseHoldEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
+ this.save(houseHoldEntity);
+ });
+ }
+
+ /**
+ * 住户审核统计
+ * @param userId
+ * @return
+ */
+ @Override
+ 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;
+ }
+
+ @Override
+ public Object getHouseHoldStatistics(String code, String roleType) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ if (roleType.equals("2")) {
+ List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, null, roleType);
+ List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, null, roleType);
+ objectObjectHashMap.put("gender", result);
+ objectObjectHashMap.put("age", result1);
+ return objectObjectHashMap;
+ } else {
+ List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, AuthUtil.getUserId(), roleType);
+ List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, AuthUtil.getUserId(), roleType);
+ objectObjectHashMap.put("gender", result);
+ objectObjectHashMap.put("age", result1);
+ return objectObjectHashMap;
+ }
+
+ }
}
--
Gitblit v1.9.3