|
@@ -105,8 +105,8 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
|
|
item.put(excelUtil.getColeNames().get(index++), house.getGarden() != null ? house.getGarden().toString() : "0");
|
|
item.put(excelUtil.getColeNames().get(index++), house.getGarden() != null ? house.getGarden().toString() : "0");
|
|
item.put(excelUtil.getColeNames().get(index++), house.getSales() != null ? house.getSales().toString() : "0");
|
|
item.put(excelUtil.getColeNames().get(index++), house.getSales() != null ? house.getSales().toString() : "0");
|
|
item.put(excelUtil.getColeNames().get(index++), house.getHouse() != null ? house.getHouse().toString() : "0");
|
|
item.put(excelUtil.getColeNames().get(index++), house.getHouse() != null ? house.getHouse().toString() : "0");
|
|
- item.put(excelUtil.getColeNames().get(index++), house.getSaleVideos().toString());
|
|
|
|
- item.put(excelUtil.getColeNames().get(index++), house.getHouseVideos().toString());
|
|
|
|
|
|
+ item.put(excelUtil.getColeNames().get(index++), house.getHouse() != null ? house.getSaleVideos().toString() : "0");
|
|
|
|
+ item.put(excelUtil.getColeNames().get(index++), house.getHouseVideos() != null ? house.getHouseVideos().toString() : "0");
|
|
item.put(excelUtil.getColeNames().get(index++), house.getPoints() != null ? house.getPoints().toString() : "0");
|
|
item.put(excelUtil.getColeNames().get(index++), house.getPoints() != null ? house.getPoints().toString() : "0");
|
|
item.put(excelUtil.getColeNames().get(index++), house.getCreateTime().format(df));
|
|
item.put(excelUtil.getColeNames().get(index++), house.getCreateTime().format(df));
|
|
item.put(excelUtil.getColeNames().get(index++), house.getUpdateTime().format(df));
|
|
item.put(excelUtil.getColeNames().get(index++), house.getUpdateTime().format(df));
|
|
@@ -194,7 +194,7 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
|
|
panoSceneWithTypesMap = panoService.listPanoSceneWithTypes(houseVOS.get(i).getHouseId(), token);
|
|
panoSceneWithTypesMap = panoService.listPanoSceneWithTypes(houseVOS.get(i).getHouseId(), token);
|
|
|
|
|
|
if (MapUtils.isNotEmpty(panoSceneWithTypesMap)) {
|
|
if (MapUtils.isNotEmpty(panoSceneWithTypesMap)) {
|
|
- List<String> nums = panoSceneWithTypesMap.entrySet().stream().map(e -> e.getValue().toString()).collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> nums = panoSceneWithTypesMap.entrySet().stream().map(e -> e.getKey()).collect(Collectors.toList());
|
|
|
|
|
|
sceneRspBean = sceneFeign.listScenesInNums(nums, token);
|
|
sceneRspBean = sceneFeign.listScenesInNums(nums, token);
|
|
List<SceneProEntity> scenes = (List<SceneProEntity>) sceneRspBean.getData();
|
|
List<SceneProEntity> scenes = (List<SceneProEntity>) sceneRspBean.getData();
|