BJ_ZTEITS-Developers / zteits-bcp-portal

Commit d67b75d2ffc4255c016251a15abe29d5dd5b5984

Authored by 王彪总
2 parents a07ba3bd 8d603df9

Merge branch 'branch_0808' of 

http://192.168.1.195:9998/ZTEITS-Developers/zteits-bcp-portal.git into
branch_0808

Conflicts:
	src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
Inline Side-by-side
Showing 2 changed files with 22 additions and 13 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
  View file @d67b75d
... ... @@ -179,7 +179,7 @@ public class PdaController extends BizController {
179 179 }
180 180  
181 181 @ApiOperation("pda信息导出excel")
182   - @PostMapping("exportpdaExcel")
  182 + @GetMapping("exportBerthInfoExcel")
183 183 public void exportBerthInfoExcel(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest requests, HttpServletResponse response) {
184 184 tpPPdaRequest.setSysCode(sysCode);
185 185 BizResult<List<TpPPdaDTO>> list = tpPPdaService.queryPdaInfo(tpPPdaRequest);
... ...
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
  View file @d67b75d
... ... @@ -5,6 +5,7 @@ import java.util.ArrayList;
5 5 import java.util.List;
6 6 import java.util.Map;
7 7  
  8 +import javax.servlet.http.HttpServletRequest;
8 9 import javax.servlet.http.HttpServletResponse;
9 10 import javax.servlet.http.HttpSession;
10 11  
... ... @@ -201,12 +202,18 @@ public class ParkLotManageController extends BizController{
201 202 * @throws Exception
202 203 */
203 204 @ApiOperation("导出停车场信息")
204   - @PostMapping("/parkingToExcleForPage")
205   - public void parkingToExcleForPage(@RequestBody QueryParkingLotByParkRequest request,HttpServletResponse response) throws Exception{
  205 + @RequestMapping("/parkingToExcleForPage")
  206 + public void parkingToExcleForPage(@RequestParam List<String> plNos,@RequestParam List<Long> plAreaBlockIds,@RequestParam Integer plType
  207 + ,HttpServletRequest request,HttpServletResponse response) throws Exception{
206 208 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
207   -
208   - BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(request,0,0);
209   -
  209 + QueryParkingLotByParkRequest queryParking = new QueryParkingLotByParkRequest();
  210 + queryParking.setSysCode("1001");
  211 + queryParking.getBaseRequest().setPageSize(0);
  212 + queryParking.setPlNos(plNos);
  213 + queryParking.setPlAreaBlockIds(plAreaBlockIds);
  214 + queryParking.setPlType(plType);
  215 + BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(queryParking,0,0);
  216 +
210 217 String[] title = new String[]{"停车场编号","停车场名称"};
211 218 String sheetName="停车场";
212 219 String fileName = "停车场信息";
... ... @@ -217,13 +224,15 @@ public class ParkLotManageController extends BizController{
217 224 //3.填充数据
218 225 List<Object[]> contentList=new ArrayList<Object[]>();
219 226 List<ParkingLotDTO> list = bizResult.getData().getDataList();
220   - for (ParkingLotDTO e: list) {
221   - Object[] obj=new Object[title.length];
222   - int index=0;
223   - obj[index++]=e.getPlNo();
224   - obj[index++]=e.getPlName();
225   -
226   - contentList.add(obj);
  227 + if(!CollectionUtils.isEmpty(list)){
  228 + for (ParkingLotDTO e: list) {
  229 + Object[] obj=new Object[title.length];
  230 + int index=0;
  231 + obj[index++]=e.getPlNo();
  232 + obj[index++]=e.getPlName();
  233 +
  234 + contentList.add(obj);
  235 + }
227 236 }
228 237 ExcleFillDateManager fillUserManager=new ExcleFillDateManager();
229 238 fillUserManager.fillSalesOrga(workSheet,title,contentList,2);
... ...