zhongrj
2024-05-15 4de8e288c0512991d847866267d91d08f73760a9
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -338,7 +338,10 @@
      for (ImportHouseholdExcel houseHoldExcel : data) {
         HouseholdEntity householdEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
         // 判断姓名,手机号
         if (Strings.isBlank(householdEntity.getName()) || Strings.isBlank(householdEntity.getPhoneNumber())){
         if (Strings.isBlank(householdEntity.getName())
            || Strings.isBlank(householdEntity.getPhoneNumber())
            || Strings.isBlank(householdEntity.getHouseCode())
         ){
            errorNum ++;
            continue;
         }
@@ -431,10 +434,12 @@
      }
      StringBuilder builder = new StringBuilder("导入完成!");
      builder.append("其中本次表格共有 ").append(totalNum).append(" 条数据,")
         .append("成功导入 ").append(importNum).append(" 条数据,")
         .append("其中有 ").append(updateNum).append(" 条数据已存在。");
         .append("成功导入 ").append(importNum).append(" 条数据。");
      if (updateNum>0) {
         builder.append("其中有 ").append(updateNum).append(" 条数据已存在。");
      }
      if (errorNum>0){
         builder.append("共有 ").append(errorNum).append(" 条数据由于无姓名或手机号信息未导入!");
         builder.append("共有 ").append(errorNum).append(" 条数据由于无姓名或手机号或门牌地址编码信息未导入!");
      }
      return builder.toString();
   }