From dfe5abae2b555e4e9280576acb27219d8b998fab Mon Sep 17 00:00:00 2001 From: atao Date: Mon, 28 Aug 2017 16:24:44 +0800 Subject: [PATCH] 提交代码 --- src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/OrderManageController.java | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/OrderManageController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/OrderManageController.java index 7a6d67f..a927951 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/OrderManageController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/OrderManageController.java @@ -85,10 +85,10 @@ public class OrderManageController extends BizController { @RequestMapping("/exportAllParkOrderByCondition") public void exportAllParkOrderByCondition(@RequestParam String plNos, @RequestParam(required = false) String parkStatus, @RequestParam(required = false) String payType, @RequestParam(required = false) String parkType, - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date beginInTime, - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endInTime, - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date beginOutTime, - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endOutTime, + @RequestParam(required = false) Long beginInTime, + @RequestParam(required = false) Long endInTime, + @RequestParam(required = false) Long beginOutTime, + @RequestParam(required = false) Long endOutTime, @RequestParam(required = false) String carNum, HttpServletRequest request, HttpServletResponse response) { @@ -124,10 +124,20 @@ public class OrderManageController extends BizController { } dubboReq.setParkType(nums); } - dubboReq.setBeginInTime(beginInTime); - dubboReq.setEndInTime(endInTime); - dubboReq.setBeginOutTime(beginOutTime); - dubboReq.setEndOutTime(endOutTime); + if(null != beginInTime){ + dubboReq.setBeginInTime(new Date(beginInTime)); + } + + if(null != endInTime){ + dubboReq.setEndInTime(new Date(endInTime)); + } + if(null != beginOutTime){ + dubboReq.setBeginOutTime(new Date(beginOutTime)); + } + if(null != endOutTime){ + dubboReq.setEndOutTime(new Date(endOutTime)); + } + dubboReq.setCarNum(carNum); dubboReq.setSysCode("10001"); dubboReq.getBaseRequest().setPageNum(1); -- libgit2 0.21.4