BJ_ZTEITS-Developers / zteits-bcp-portal

Commit dfe5abae2b555e4e9280576acb27219d8b998fab

Authored by atao
1 parent 18d1bfad

提交代码

Inline Side-by-side
Showing 1 changed file with 18 additions and 8 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/OrderManageController.java
  View file @dfe5aba
... ... @@ -85,10 +85,10 @@ public class OrderManageController extends BizController {
85 85 @RequestMapping("/exportAllParkOrderByCondition")
86 86 public void exportAllParkOrderByCondition(@RequestParam String plNos, @RequestParam(required = false) String parkStatus,
87 87 @RequestParam(required = false) String payType, @RequestParam(required = false) String parkType,
88   - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date beginInTime,
89   - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endInTime,
90   - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date beginOutTime,
91   - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endOutTime,
  88 + @RequestParam(required = false) Long beginInTime,
  89 + @RequestParam(required = false) Long endInTime,
  90 + @RequestParam(required = false) Long beginOutTime,
  91 + @RequestParam(required = false) Long endOutTime,
92 92 @RequestParam(required = false) String carNum, HttpServletRequest request,
93 93 HttpServletResponse response) {
94 94  
... ... @@ -124,10 +124,20 @@ public class OrderManageController extends BizController {
124 124 }
125 125 dubboReq.setParkType(nums);
126 126 }
127   - dubboReq.setBeginInTime(beginInTime);
128   - dubboReq.setEndInTime(endInTime);
129   - dubboReq.setBeginOutTime(beginOutTime);
130   - dubboReq.setEndOutTime(endOutTime);
  127 + if(null != beginInTime){
  128 + dubboReq.setBeginInTime(new Date(beginInTime));
  129 + }
  130 +
  131 + if(null != endInTime){
  132 + dubboReq.setEndInTime(new Date(endInTime));
  133 + }
  134 + if(null != beginOutTime){
  135 + dubboReq.setBeginOutTime(new Date(beginOutTime));
  136 + }
  137 + if(null != endOutTime){
  138 + dubboReq.setEndOutTime(new Date(endOutTime));
  139 + }
  140 +
131 141 dubboReq.setCarNum(carNum);
132 142 dubboReq.setSysCode("10001");
133 143 dubboReq.getBaseRequest().setPageNum(1);
... ...