es住户数据（地址）处理修改

zhongrj

2024-05-21 f2353404a3ec98b14cbc33b188e95af20de3ddda

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

@@ -21,6 +21,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import lombok.AllArgsConstructor;
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.core.boot.ctrl.BladeController;
@@ -36,7 +37,6 @@
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.ExportHouseholdExcel;
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.excel.HouseHoldImporter;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
@@ -231,10 +231,10 @@
   @PostMapping("import-household")
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入住户", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
   public R importUser(MultipartFile file, Integer isCovered, @RequestParam(value = "isTenant", required = false) String isTenant) {
      bladeLogger.info("住户信息导入", JsonUtil.toJson(isCovered));
      String data = householdService.importUserHouseHold(ExcelUtil.read(file, ImportHouseholdExcel.class),isCovered==1);
      return R.data(200,data,null);
      String data = householdService.importUserHouseHold(ExcelUtil.read(file, ImportHouseholdExcel.class), isCovered == 1, isTenant);
      return R.data(200, data, null);
   }

   /**
@@ -254,7 +254,7 @@
   @GetMapping("/export-template")
   @ApiOperationSupport(order = 15)
   @ApiOperation(value = "模板下載", notes = "传入response")
   public void exportUser(HttpServletResponse response) {
   public void exportUser(HttpServletResponse response, @RequestParam(value = "isTenant", required = false) String isTenant) {
      List<ImportHouseholdExcel> list = new ArrayList<>();
      ImportHouseholdExcel houseHoldExcel = new ImportHouseholdExcel();
      // 设置模板数据
@@ -265,7 +265,11 @@
      houseHoldExcel.setBirthday("2001-01-01");
      houseHoldExcel.setIdCard("360*************0001");
      houseHoldExcel.setOtherContact("13112341234");
      houseHoldExcel.setRelationship("1");
      if (StringUtils.isBlank(isTenant)) {
         houseHoldExcel.setRelationship("1");
      } else {
         houseHoldExcel.setRelationship("18");
      }
      houseHoldExcel.setIsPrimaryContact("1");
      houseHoldExcel.setResidentialStatus("1");
      houseHoldExcel.setEthnicity("1");