BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 81feadee71c3533375d852c1b5890b849b72646d

Authored by xiejp
1 parent 3108b902

停车场

Inline Side-by-side
Showing 1 changed file with 21 additions and 3 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
  View file @81feade
@@ -144,6 +144,11 @@ public class ParkLotManageController extends BizController{ @@ -144,6 +144,11 @@ public class ParkLotManageController extends BizController{
144 if (request == null) { 144 if (request == null) {
145 throw new BizException(ErrorType.PARAMM_NULL, "请求对象"); 145 throw new BizException(ErrorType.PARAMM_NULL, "请求对象");
146 } 146 }
  147 + if(CollectionUtils.isEmpty(request.getPlAreaBlockIds())){
  148 + PageBean<ParkingLotDTO> pageBean = new PageBean<ParkingLotDTO>();
  149 + BizResult<PageBean<ParkingLotDTO>> result = new BizResult<PageBean<ParkingLotDTO>>(pageBean);
  150 + return returnJqGridData(result, ParkingLotDTO.class);
  151 + }
147 BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(request,request.getBaseRequest().getPageNum(), request.getBaseRequest().getPageSize()); 152 BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(request,request.getBaseRequest().getPageNum(), request.getBaseRequest().getPageSize());
148 return returnJqGridData(bizResult, ParkingLotDTO.class); 153 return returnJqGridData(bizResult, ParkingLotDTO.class);
149 } 154 }
@@ -212,9 +217,13 @@ public class ParkLotManageController extends BizController{ @@ -212,9 +217,13 @@ public class ParkLotManageController extends BizController{
212 queryParking.setPlNos(plNos); 217 queryParking.setPlNos(plNos);
213 queryParking.setPlAreaBlockIds(plAreaBlockIds); 218 queryParking.setPlAreaBlockIds(plAreaBlockIds);
214 queryParking.setPlType(plType); 219 queryParking.setPlType(plType);
215 - BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(queryParking,0,0);  
216 -  
217 - String[] title = new String[]{"停车场编号","停车场名称","块名称","区间数","泊位数"}; 220 + PageBean<ParkingLotDTO> pageBean = new PageBean<ParkingLotDTO>();
  221 + BizResult<PageBean<ParkingLotDTO>> bizResult = new BizResult<PageBean<ParkingLotDTO>>(pageBean);
  222 + if(!CollectionUtils.isEmpty(plAreaBlockIds)){
  223 + bizResult = parkingLotQueryService.queryParkingLotByPark(queryParking,0,0);
  224 + }
  225 + String[] title = new String[]{"停车场编号","停车场名称","省","市","区","块名称"
  226 + ,"出口数","入口数","泊位数","停车场地址","区间数","泊位数","经度","纬度"};
218 String sheetName="停车场"; 227 String sheetName="停车场";
219 String fileName = "停车场信息"; 228 String fileName = "停车场信息";
220 // 1.创建excel信息 229 // 1.创建excel信息
@@ -230,9 +239,18 @@ public class ParkLotManageController extends BizController{ @@ -230,9 +239,18 @@ public class ParkLotManageController extends BizController{
230 int index=0; 239 int index=0;
231 obj[index++]=e.getPlNo(); 240 obj[index++]=e.getPlNo();
232 obj[index++]=e.getPlName(); 241 obj[index++]=e.getPlName();
  242 + obj[index++]=e.getPlProvinceName();
  243 + obj[index++]=e.getPlCityName();
  244 + obj[index++]=e.getPlCountryName();
233 obj[index++]=e.getPlAreaBlockName(); 245 obj[index++]=e.getPlAreaBlockName();
  246 + obj[index++]=e.getPlExitNum();
  247 + obj[index++]=e.getPlEntranceNum();
  248 + obj[index++]=e.getPlBerthNum();
  249 + obj[index++]=e.getPlAddress();
234 obj[index++]=e.getParkAreaNum(); 250 obj[index++]=e.getParkAreaNum();
235 obj[index++]=e.getBerthNum(); 251 obj[index++]=e.getBerthNum();
  252 + obj[index++]=e.getLonId();
  253 + obj[index++]=e.getLatId();
236 contentList.add(obj); 254 contentList.add(obj);
237 } 255 }
238 } 256 }