diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java index 0f2606c..bd049c4 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java @@ -179,7 +179,7 @@ public class PdaController extends BizController { } @ApiOperation("pda信息导出excel") - @PostMapping("exportpdaExcel") + @GetMapping("exportBerthInfoExcel") public void exportBerthInfoExcel(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest requests, HttpServletResponse response) { tpPPdaRequest.setSysCode(sysCode); BizResult> list = tpPPdaService.queryPdaInfo(tpPPdaRequest); diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java index 35ea5a1..f57525f 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -201,12 +202,18 @@ public class ParkLotManageController extends BizController{ * @throws Exception */ @ApiOperation("导出停车场信息") - @PostMapping("/parkingToExcleForPage") - public void parkingToExcleForPage(@RequestBody QueryParkingLotByParkRequest request,HttpServletResponse response) throws Exception{ + @RequestMapping("/parkingToExcleForPage") + public void parkingToExcleForPage(@RequestParam List plNos,@RequestParam List plAreaBlockIds,@RequestParam Integer plType + ,HttpServletRequest request,HttpServletResponse response) throws Exception{ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - BizResult> bizResult = parkingLotQueryService.queryParkingLotByPark(request,0,0); - + QueryParkingLotByParkRequest queryParking = new QueryParkingLotByParkRequest(); + queryParking.setSysCode("1001"); + queryParking.getBaseRequest().setPageSize(0); + queryParking.setPlNos(plNos); + queryParking.setPlAreaBlockIds(plAreaBlockIds); + queryParking.setPlType(plType); + BizResult> bizResult = parkingLotQueryService.queryParkingLotByPark(queryParking,0,0); + String[] title = new String[]{"停车场编号","停车场名称"}; String sheetName="停车场"; String fileName = "停车场信息"; @@ -217,13 +224,15 @@ public class ParkLotManageController extends BizController{ //3.填充数据 List contentList=new ArrayList(); List list = bizResult.getData().getDataList(); - for (ParkingLotDTO e: list) { - Object[] obj=new Object[title.length]; - int index=0; - obj[index++]=e.getPlNo(); - obj[index++]=e.getPlName(); - - contentList.add(obj); + if(!CollectionUtils.isEmpty(list)){ + for (ParkingLotDTO e: list) { + Object[] obj=new Object[title.length]; + int index=0; + obj[index++]=e.getPlNo(); + obj[index++]=e.getPlName(); + + contentList.add(obj); + } } ExcleFillDateManager fillUserManager=new ExcleFillDateManager(); fillUserManager.fillSalesOrga(workSheet,title,contentList,2);