|
@ -60,7 +60,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService { |
|
|
params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE)); |
|
|
params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE)); |
|
|
} |
|
|
} |
|
|
if (params.containsKey("level")) { |
|
|
if (params.containsKey("level")) { |
|
|
if("neighborhoodCode".equals(params.get("level").toString())){ |
|
|
if("neighborhood".equals(params.get("level").toString())){ |
|
|
page = factNeighborhoodUserHouseDailyService.page(params); |
|
|
page = factNeighborhoodUserHouseDailyService.page(params); |
|
|
|
|
|
|
|
|
}else if (OrgLevelEnum.COMMUNITY.getCode().equals(params.get("level").toString())) { |
|
|
}else if (OrgLevelEnum.COMMUNITY.getCode().equals(params.get("level").toString())) { |
|
@ -87,7 +87,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService { |
|
|
} |
|
|
} |
|
|
// 网格纬度查询网格统计表,其余纬度查询组织统计表
|
|
|
// 网格纬度查询网格统计表,其余纬度查询组织统计表
|
|
|
if (params.containsKey("level")) { |
|
|
if (params.containsKey("level")) { |
|
|
if("neighborhoodCode".equals(params.get("level").toString())){ |
|
|
if("neighborhood".equals(params.get("level").toString())){ |
|
|
dto = factNeighborhoodUserHouseDailyService.getTotal(params); |
|
|
dto = factNeighborhoodUserHouseDailyService.getTotal(params); |
|
|
}else if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) { |
|
|
}else if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) { |
|
|
dto = factGridUserHouseDailyService.getTotal(params); |
|
|
dto = factGridUserHouseDailyService.getTotal(params); |
|
@ -102,7 +102,7 @@ public class FactUserHouseServiceImpl implements FactUserHouseService { |
|
|
public List<FactUserHouseResultDTO> list(Map<String, Object> params) { |
|
|
public List<FactUserHouseResultDTO> list(Map<String, Object> params) { |
|
|
List<FactUserHouseResultDTO> list = new ArrayList<>(); |
|
|
List<FactUserHouseResultDTO> list = new ArrayList<>(); |
|
|
if (params.containsKey("level")) { |
|
|
if (params.containsKey("level")) { |
|
|
if("neighborhoodCode".equals(params.get("level").toString())){ |
|
|
if("neighborhood".equals(params.get("level").toString())){ |
|
|
list = factNeighborhoodUserHouseDailyService.listExport(params); |
|
|
list = factNeighborhoodUserHouseDailyService.listExport(params); |
|
|
}else if (OrgLevelEnum.COMMUNITY.getCode().equals(params.get("level").toString())) { |
|
|
}else if (OrgLevelEnum.COMMUNITY.getCode().equals(params.get("level").toString())) { |
|
|
list = factGridUserHouseDailyService.listExport(params); |
|
|
list = factGridUserHouseDailyService.listExport(params); |
|
|