From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 110 insertions(+), 3 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..701ca8d 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,16 +17,24 @@
package org.springblade.modules.house.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.common.node.TreeNode;
+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.HouseholdVO;
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.system.entity.DictBiz;
+import org.springblade.modules.house.excel.HouseHoldExcel;
+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.Date;
import java.util.List;
+import java.util.Objects;
/**
* 住户 服务实现类
@@ -36,6 +44,9 @@
*/
@Service
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {
+
+ @Autowired
+ private IDictBizService dictBizService;
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
@@ -48,7 +59,103 @@
* @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) {
+ boolean flag = false;
+ household.setUpdateTime(new Date());
+ household.setUpdateUser(AuthUtil.getUserId());
+ if (null!=household.getId()){
+ // 更新
+ flag = updateById(household);
+ }else {
+ // 新增
+ 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);
+ }
}
--
Gitblit v1.9.3