Merge remote-tracking branch 'origin/master'

linwe

2023-11-25 8400a67289b214b83a20484410fff96d236c6d49

 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java

@@ -17,21 +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;

/**
 * 住户 服务实现类
@@ -56,7 +59,7 @@
    * @return
    */
   @Override
   public List<TreeNode> selectHouseNodeList(Long userId) {
   public List<TreeStringNode> selectHouseNodeList(Long userId) {
      return baseMapper.selectHouseNodeList(userId);
   }

@@ -129,4 +132,30 @@
   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);
   }
}