|
@@ -55,19 +55,22 @@ public class TransArriveExportController { |
|
@@ -55,19 +55,22 @@ public class TransArriveExportController { |
55
|
@GetMapping("/selectTrans")
|
55
|
@GetMapping("/selectTrans")
|
56
|
public ResultJson<PageInfo<TRANSTOARRIVEEXPORT>> selectPrediction(@RequestParam(value = "customscode", required = false) String customscode,
|
56
|
public ResultJson<PageInfo<TRANSTOARRIVEEXPORT>> selectPrediction(@RequestParam(value = "customscode", required = false) String customscode,
|
57
|
@RequestParam(value = "username", required = false) String username,
|
57
|
@RequestParam(value = "username", required = false) String username,
|
58
|
- @RequestParam(value = "trafmode", required = false) String trafmode,
|
58
|
+ @RequestParam(value = "trnmode", required = false) String trnmode,
|
59
|
@RequestParam(value = "unloadcode", required = false) String unloadcode,
|
59
|
@RequestParam(value = "unloadcode", required = false) String unloadcode,
|
60
|
- @RequestParam(value = "creattime", required = false) String creattime,
|
60
|
+ @RequestParam(value = "startDate", required = false) String startDate,
|
|
|
61
|
+ @RequestParam(value = "endDate", required = false) String endDate,
|
61
|
@RequestParam(value = "pageNum",required = false,defaultValue = "1") int pageNum,
|
62
|
@RequestParam(value = "pageNum",required = false,defaultValue = "1") int pageNum,
|
62
|
@RequestParam(value = "pageSize",required = false,defaultValue = "100") int pageSize){
|
63
|
@RequestParam(value = "pageSize",required = false,defaultValue = "100") int pageSize){
|
63
|
TRANSTOARRIVEEXPORT trans=new TRANSTOARRIVEEXPORT();
|
64
|
TRANSTOARRIVEEXPORT trans=new TRANSTOARRIVEEXPORT();
|
64
|
- if(StringUtils.isNotEmpty(creattime)){
|
|
|
65
|
- Date flight_Date = DateUtil.parseDate(creattime,"yyyyMMdd");
|
|
|
66
|
- trans.setCreattime(flight_Date);
|
65
|
+ if(StringUtils.isNotEmpty(endDate) && StringUtils.isNotEmpty(startDate)){
|
|
|
66
|
+ Date start = DateUtil.parseDate(startDate,"yyyy-MM-dd");
|
|
|
67
|
+ Date end = DateUtil.parseDate(endDate,"yyyy-MM-dd");
|
|
|
68
|
+ trans.setCreattimeStart(start);
|
|
|
69
|
+ trans.setCreattimeEnd(end);
|
67
|
}
|
70
|
}
|
68
|
trans.setCustomscode(customscode);
|
71
|
trans.setCustomscode(customscode);
|
69
|
trans.setUsername(username);
|
72
|
trans.setUsername(username);
|
70
|
- trans.setTrafmode(trafmode);
|
73
|
+ trans.setTrnmode(trnmode);
|
71
|
trans.setUnloadcode(unloadcode);
|
74
|
trans.setUnloadcode(unloadcode);
|
72
|
PageInfo<TRANSTOARRIVEEXPORT> pageInfo = transArriveExportService.selectTrans(trans,pageNum,pageSize);
|
75
|
PageInfo<TRANSTOARRIVEEXPORT> pageInfo = transArriveExportService.selectTrans(trans,pageNum,pageSize);
|
73
|
return new ResultJson("200","success",pageInfo);
|
76
|
return new ResultJson("200","success",pageInfo);
|