住户导入调整（同一户室重名问题）

zhongrj

2024-05-28 55ad93112aa86d72a7c67b74256937bd1a7db278

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

@@ -356,7 +356,7 @@
         wrapper.eq("house_code", householdEntity.getHouseCode())
            .eq("is_deleted", 0)
            .eq("name", householdEntity.getName());
         HouseholdEntity one = this.getOne(wrapper);
         List<HouseholdEntity> list = this.list(wrapper);
         // 与角色关系
         if (!Strings.isBlank(houseHoldExcel.getRelationship())) {
            householdEntity.setRelationship(Integer.parseInt(houseHoldExcel.getRelationship()));
@@ -442,7 +442,7 @@
            householdEntity.setMaritalStatus(Integer.parseInt(houseHoldExcel.getMaritalStatus()));
         }

         if (one==null){
         if (list.size()==0){
            // 新增
            this.save(householdEntity);
            importNum++;
@@ -451,14 +451,16 @@
         }else {
            updateNum++;
            if (isCovered){
               for (HouseholdEntity one : list) {
               // 覆盖更新
               householdEntity.setId(one.getId());
               // 更新
               updateById(householdEntity);
               importNum++;
               // 处理标签
               handleLabel(householdEntity,houseHoldExcel);
            }
               importNum++;
            }
         }
      }
      StringBuilder builder = new StringBuilder("导入完成!");