linwe
2024-05-24 88a1e4b6825704f10d5c4207616fad1a5171656b
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -36,6 +36,7 @@
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.HouseTenantExcel;
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseRentalService;
@@ -374,8 +375,20 @@
            if (houseRentalEntity != null) {
               householdEntity.setHousingRentalId(houseRentalEntity.getId());
            } else {
               errorNum++;
               continue;
               // 新建出租屋
               HouseRentalEntity houseRentalEntity1 = new HouseRentalEntity();
               houseRentalEntity1.setHouseCode(householdEntity.getHouseCode());
               houseRentalEntity1.setHouseStatus(1);
               houseRentalEntity1.setAuditStatus(0);
               houseRentalEntity1.setRentalUse(4);
               houseRentalEntity1.setTenantRelationship(1);
               houseRentalEntity1.setRentalTime(new Date());
               houseRentalEntity1.setDueTime(new Date());
               houseRentalEntity1.setTerminationTime(new Date());
               iHouseRentalService.save(houseRentalEntity1);
               householdEntity.setHousingRentalId(houseRentalEntity1.getId());
               // errorNum++;
               // continue;
            }
         }
         /// 是否主要联系人
@@ -780,12 +793,24 @@
   /**
    * 查询对应的住户集合
    *
    * @param i
    * @param size
    * @return
    */
   @Override
   public List<HouseholdVO> getAllList(int i, int size) {
      return baseMapper.getAllList(i,size);
      return baseMapper.getAllList(i, size);
   }
   @Override
   public List<HouseTenantExcel> exportTenant(HouseholdVO household) {
      CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, household);
      List<HouseTenantExcel> houseTenantExcels = baseMapper.exportTenant(household,
         commonParamSet.getIsAdministrator(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getGridCodeList()
      );
      return houseTenantExcels;
   }
}