|
|
|
@ -102,91 +102,26 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public IcNeighborHoodResultDTO listNeighborhood(ListIcNeighborHoodFormDTO formDTO) { |
|
|
|
String dataType = formDTO.getLevel(); |
|
|
|
String level = formDTO.getLevel(); |
|
|
|
Integer pageNo = formDTO.getPageNo(); |
|
|
|
Integer pageSize = formDTO.getPageSize(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); |
|
|
|
result.setDataType(dataType); |
|
|
|
|
|
|
|
if(StringUtils.isEmpty(dataType)|| NeighborhoodConstant.NEIGHBOR_HOOD.equals(dataType)){ |
|
|
|
//如果类型是neighbourHood 查小区
|
|
|
|
IPage<Map<String, Object>> resultMap = searchNeighborhood(formDTO); |
|
|
|
result.setTotal(resultMap.getTotal()); |
|
|
|
result.setList(resultMap.getRecords()); |
|
|
|
}else if(NeighborhoodConstant.BUILDING.equals(dataType)){ |
|
|
|
//如果类型是building 查楼栋
|
|
|
|
IPage<Map<String, Object>> resultMap = searchBuilding(formDTO); |
|
|
|
result.setTotal(resultMap.getTotal()); |
|
|
|
result.setList(resultMap.getRecords()); |
|
|
|
}else if(NeighborhoodConstant.HOUSE.equals(dataType)){ |
|
|
|
//如果类型是house 查房屋
|
|
|
|
IPage<Map<String, Object>> resultMap = searchHouse(formDTO); |
|
|
|
result.setTotal(resultMap.getTotal()); |
|
|
|
result.setList(resultMap.getRecords()); |
|
|
|
} |
|
|
|
return result; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private IPage<Map<String, Object>> searchHouse(ListIcNeighborHoodFormDTO formDTO) { |
|
|
|
IPage<IcHouseEntity> page = new Page<IcHouseEntity>(formDTO.getPageNo(),formDTO.getPageSize()); |
|
|
|
|
|
|
|
// QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
// neighborHoodEntityQueryWrapper.lambda()
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
|
|
|
|
// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
|
|
|
|
// IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
|
|
|
|
|
|
|
|
|
|
|
|
// QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
// buildingEntityQueryWrapper.lambda()
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId())
|
|
|
|
// .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName());
|
|
|
|
// IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class);
|
|
|
|
IPage<Map<String, Object>> resultMap = searchNeighborhood(formDTO); |
|
|
|
result.setTotal(resultMap.getTotal()); |
|
|
|
result.setList(resultMap.getRecords()); |
|
|
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
// QueryWrapper<IcHouseEntity> houseEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
// houseEntityQueryWrapper.lambda()
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getOwnerName()),IcHouseEntity::getOwnerName,formDTO.getOwnerName())
|
|
|
|
// .like(!StringUtils.isEmpty(formDTO.getOwnerPhone()),IcHouseEntity::getOwnerPhone,formDTO.getOwnerPhone());
|
|
|
|
// houseEntityQueryWrapper.eq("a.DEL_FLAG","0");
|
|
|
|
IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); |
|
|
|
house.setDelFlag("0"); |
|
|
|
|
|
|
|
return icHouseDao.searchHouseByPage(page,house); |
|
|
|
} |
|
|
|
private IPage<Map<String, Object>> searchBuilding(ListIcNeighborHoodFormDTO formDTO) { |
|
|
|
IPage<IcBuildingEntity> page = new Page<IcBuildingEntity>(formDTO.getPageNo(),formDTO.getPageSize()); |
|
|
|
|
|
|
|
// IcNeighborHoodEntity neighbor = new IcNeighborHoodEntity();
|
|
|
|
// IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
|
|
|
|
|
|
|
|
// QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
// neighborHoodEntityQueryWrapper.lambda()
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
|
|
|
|
// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
|
|
|
|
|
|
|
|
|
|
|
|
IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); |
|
|
|
building.setDelFlag("0"); |
|
|
|
// QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
//
|
|
|
|
// buildingEntityQueryWrapper.lambda()
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId())
|
|
|
|
// .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName());
|
|
|
|
// buildingEntityQueryWrapper.eq("a.DEL_FLAG","0");
|
|
|
|
|
|
|
|
return icBuildingDao.searchBuildingByPage(page,building); |
|
|
|
} |
|
|
|
|
|
|
|
private IPage<Map<String,Object>> searchNeighborhood(ListIcNeighborHoodFormDTO formDTO) { |
|
|
|
|
|
|
|
@ -202,6 +137,13 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { |
|
|
|
|
|
|
|
IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); |
|
|
|
neighbor.setDelFlag("0"); |
|
|
|
if(NeighborhoodConstant.GRID.equals(formDTO.getLevel())){ |
|
|
|
//根据网格过滤
|
|
|
|
neighbor.setGridId(formDTO.getId()); |
|
|
|
}else{ |
|
|
|
//根据组织过滤
|
|
|
|
neighbor.setAgencyId(formDTO.getId()); |
|
|
|
} |
|
|
|
return icNeighborHoodDao.searchNeighborhoodByPage(page, neighbor); |
|
|
|
} |
|
|
|
|
|
|
|
@ -274,38 +216,14 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void exportNeighborhoodinfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { |
|
|
|
String dataType = formDTO.getLevel(); |
|
|
|
|
|
|
|
if(StringUtils.isEmpty(dataType)|| NeighborhoodConstant.NEIGHBOR_HOOD.equals(dataType)){ |
|
|
|
//如果类型是neighbourHood 查小区
|
|
|
|
//导出小区
|
|
|
|
List<IcNeighborHoodExcel> icNeighborHoodExcels = searchAllNeighborhood(formDTO); |
|
|
|
//导出小区
|
|
|
|
List<IcNeighborHoodExcel> icNeighborHoodExcels = searchAllNeighborhood(formDTO); |
|
|
|
// ExcelUtils.exportExcelToTarget(response, "小区信息录入表", icNeighborHoodExcels, IcNeighborHoodExcel.class);
|
|
|
|
|
|
|
|
TemplateExportParams templatePath = new TemplateExportParams("excel/neighbor_template.xlsx"); |
|
|
|
ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"小区信息录入表",response); |
|
|
|
|
|
|
|
return ; |
|
|
|
}else if(NeighborhoodConstant.BUILDING.equals(dataType)){ |
|
|
|
//如果类型是building 查楼栋
|
|
|
|
//导出楼栋
|
|
|
|
List<IcBuildingExcel> icBuildingExcels = searchAllBuilding(formDTO); |
|
|
|
// ExcelUtils.exportExcelToTarget(response, "楼宇信息录入表", icBuildingExcels, IcBuildingExcel.class);
|
|
|
|
TemplateExportParams templatePath = new TemplateExportParams("excel/building_template.xlsx"); |
|
|
|
ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"楼宇信息录入表",response); |
|
|
|
|
|
|
|
return ; |
|
|
|
}else if(NeighborhoodConstant.HOUSE.equals(dataType)){ |
|
|
|
//如果类型是house 查房屋
|
|
|
|
//导出房屋
|
|
|
|
|
|
|
|
List<IcHouseExcel> icHouseExcels = searchAllHouse(formDTO); |
|
|
|
// ExcelUtils.exportExcelToTarget(response, "房屋信息录入表", icHouseExcels, IcHouseExcel.class);
|
|
|
|
TemplateExportParams templatePath = new TemplateExportParams("excel/house_template.xlsx"); |
|
|
|
ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"房屋信息录入表",response); |
|
|
|
|
|
|
|
return ; |
|
|
|
} |
|
|
|
TemplateExportParams templatePath = new TemplateExportParams("excel/neighbor_export.xlsx"); |
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
map.put("maplist",icNeighborHoodExcels); |
|
|
|
ExcelPoiUtils.exportExcel(templatePath ,map,"小区信息录入表",response); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -339,16 +257,18 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { |
|
|
|
entity.setId(uuid); |
|
|
|
entity.setCustomerId(customerId); |
|
|
|
entity.setNeighborHoodName(icNeighborHoodExcel.getNeighborHoodName()); |
|
|
|
entity.setAgencyId(agencyMap.get(icNeighborHoodExcel.getAgencyName()).getId()); |
|
|
|
entity.setParentAgencyId(agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPid()); |
|
|
|
entity.setAgencyPids(agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPids()); |
|
|
|
entity.setGridId(gridMap.get(icNeighborHoodExcel.getGridName()).getId()); |
|
|
|
|
|
|
|
entity.setAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getId()).orElse("")); // agencyMap.get(icNeighborHoodExcel.getAgencyName()).getId());
|
|
|
|
entity.setParentAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getPid()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPid()
|
|
|
|
entity.setAgencyPids(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getPids()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPids()
|
|
|
|
entity.setGridId(Optional.ofNullable(gridMap.get(icNeighborHoodExcel.getGridName())).map(u->u.getId()).orElse(""));//gridMap.get(icNeighborHoodExcel.getGridName()).getId()
|
|
|
|
entity.setAddress(icNeighborHoodExcel.getAddress()); |
|
|
|
entity.setRemark(icNeighborHoodExcel.getRemark()); |
|
|
|
neighborHoodEntityList.add(entity); |
|
|
|
|
|
|
|
IcNeighborHoodPropertyEntity entity1 = new IcNeighborHoodPropertyEntity(); |
|
|
|
entity1.setPropertyId(propertyMap.get(icNeighborHoodExcel.getPropertyName()).getId()); |
|
|
|
|
|
|
|
entity1.setPropertyId(Optional.ofNullable(propertyMap.get(icNeighborHoodExcel.getPropertyName())).map(u->u.getId()).orElse("")); |
|
|
|
entity1.setNeighborHoodId(uuid); |
|
|
|
icNeighborHoodPropertyEntityList.add(entity1); |
|
|
|
} |
|
|
|
@ -360,26 +280,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
private List<IcBuildingExcel> searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) { |
|
|
|
|
|
|
|
// QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
// neighborHoodEntityQueryWrapper.lambda()
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId())
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId())
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId())
|
|
|
|
// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName());
|
|
|
|
// IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
|
|
|
|
|
|
|
|
// QueryWrapper<IcBuildingEntity> buildingEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
// buildingEntityQueryWrapper.lambda()
|
|
|
|
// .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId())
|
|
|
|
// .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName());
|
|
|
|
// buildingEntityQueryWrapper.eq("a.DEL_FLAG","0");
|
|
|
|
IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); |
|
|
|
building.setDelFlag("0"); |
|
|
|
|
|
|
|
return icBuildingDao.searchAllBuilding(building); |
|
|
|
} |
|
|
|
|
|
|
|
private List<IcNeighborHoodExcel> searchAllNeighborhood(ListIcNeighborHoodFormDTO formDTO) { |
|
|
|
// QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();
|
|
|
|
@ -395,18 +296,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { |
|
|
|
return icNeighborHoodDao.searchAllNeighborhood(neighbor); |
|
|
|
} |
|
|
|
|
|
|
|
private List<IcHouseExcel> searchAllHouse(ListIcNeighborHoodFormDTO formDTO) { |
|
|
|
|
|
|
|
IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); |
|
|
|
|
|
|
|
IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); |
|
|
|
|
|
|
|
|
|
|
|
IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); |
|
|
|
house.setDelFlag("0"); |
|
|
|
|
|
|
|
return icHouseDao.searchAllHouse(neighbor,building,house); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
lzh
4 years ago