租客导入优化

linwe

2024-05-24 88a1e4b6825704f10d5c4207616fad1a5171656b

 src/main/java/org/springblade/modules/house/controller/HouseholdController.java

@@ -36,7 +36,9 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.ExportHouseholdExcel;
import org.springblade.modules.house.excel.HouseTenantExcel;
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.excel.ImportTenantHouseholdExcel;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
@@ -245,7 +247,7 @@
   @ApiOperation(value = "导出住户", notes = "传入user")
   public void exportUser(HouseholdVO household, HttpServletResponse response) {
      List<ExportHouseholdExcel> list = householdService.export(household);
      ExcelUtil.export(response, "住户户数据" + DateUtil.time(), "住户数据表", list, ExportHouseholdExcel.class);
      ExcelUtil.export(response, "租户户数据" + DateUtil.time(), "住户数据表", list, ExportHouseholdExcel.class);
   }

   /**
@@ -298,6 +300,44 @@


   /**
    * 导出住户
    */
   @GetMapping("export-tenant-household")
   @ApiOperationSupport(order = 13)
   @ApiOperation(value = "导出住户", notes = "传入user")
   public void exporttenantUser(HouseholdVO household, HttpServletResponse response) {
      List<HouseTenantExcel> list = householdService.exportTenant(household);
      ExcelUtil.export(response, "住户户数据" + DateUtil.time(), "住户数据表", list, HouseTenantExcel.class);
   }

   /**
    * 模板下載
    */
   @GetMapping("/export-tenant-template")
   @ApiOperationSupport(order = 15)
   @ApiOperation(value = "模板下載", notes = "传入response")
   public void exportTenantUser(HttpServletResponse response, @RequestParam(value = "isTenant", required = false) String isTenant) {
      List<ImportTenantHouseholdExcel> list = new ArrayList<>();
      ImportTenantHouseholdExcel houseHoldExcel = new ImportTenantHouseholdExcel();
      // 设置模板数据
      houseHoldExcel.setHouseCode("Afdsfdasf5421********411214");
      houseHoldExcel.setName("张三");
      houseHoldExcel.setGender("1");
      houseHoldExcel.setPhoneNumber("13112341234");
      houseHoldExcel.setBirthday("2001-01-01");
      houseHoldExcel.setIdCard("360*************0001");
      if (StringUtils.isBlank(isTenant)) {
         houseHoldExcel.setRelationship("1");
      } else {
         houseHoldExcel.setRelationship("18");
      }
      houseHoldExcel.setEthnicity("1");
      houseHoldExcel.setHukouRegistration("江西上饶****");
      list.add(houseHoldExcel);
      ExcelUtil.export(response, "租户数据模板", "租户数据表", list, ImportTenantHouseholdExcel.class);
   }

   /**
    * 住户对应物业，网格，公安负责人查询
    *
    * @param household