住户导出调整

zhongrj

2024-05-15 db85e305e50167b984004da6f105d19a2c10b5a3

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

@@ -35,6 +35,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.excel.ExportHouseholdExcel;
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseService;
@@ -300,9 +301,23 @@
      return baseMapper.getHouseholdListById(household);
   }

   /**
    * 导出住户信息
    * @param household
    * @return
    */
   @Override
   public List<ImportHouseholdExcel> export(HouseholdVO household) {
      List<ImportHouseholdExcel> userHouseHoldExcels = baseMapper.export(household);
   public List<ExportHouseholdExcel> export(HouseholdVO household) {
      CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, household);
      // 重点人员与关注人员
      if (Objects.nonNull(household.getLabelType())) {
         extracted(household);
      }
      List<ExportHouseholdExcel> userHouseHoldExcels = baseMapper.export(household,
         commonParamSet.getIsAdministrator(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getGridCodeList()
      );
      return userHouseHoldExcels;
   }