| | |
| | | * @return |
| | | */ |
| | | @GetMapping("/assignedItineraryLogList") |
| | | public AjaxResult assignedItineraryLogList(){ |
| | | public AjaxResult assignedItineraryLogList(Integer pageNum, Integer pageSize){ |
| | | if (pageNum != null && pageSize != null) { |
| | | return AjaxResult.success(tmsDispatchOrderService.assignedItineraryLogListPage(pageNum, pageSize)); |
| | | } |
| | | return tmsDispatchOrderService.assignedItineraryLogList(); |
| | | } |
| | | |
| | |
| | | } |
| | | |
| | | /** |
| | | * 行程历史 |
| | | * 行程历史(旧接口,保持兼容) |
| | | */ |
| | | @GetMapping("/tmsTripList/{dispatchId}") |
| | | public AjaxResult tmsTripList(@PathVariable Integer dispatchId){ |
| | |
| | | } |
| | | |
| | | /** |
| | | * 行程历史(分页,按时间倒序,dispatchId 可选 - 不传查全部) |
| | | */ |
| | | @GetMapping("/tmsTripListPage") |
| | | public AjaxResult tmsTripListPage(Integer dispatchId, Integer pageNum, Integer pageSize){ |
| | | if (pageNum == null) pageNum = 1; |
| | | if (pageSize == null) pageSize = 10; |
| | | return AjaxResult.success(tmsTripService.tmsTripListPage(dispatchId, pageNum, pageSize)); |
| | | } |
| | | |
| | | /** |
| | | * 获取垫付列表 |
| | | * @return |
| | | */ |
| | | @GetMapping("/getTmsFinanceDetailList") |
| | | public AjaxResult getTmsFinanceDetailList(Integer dispatchId){ |
| | | public AjaxResult getTmsFinanceDetailList(Integer dispatchId, Integer pageNum, Integer pageSize){ |
| | | // 传了分页参数走分页,否则兼容旧逻辑 |
| | | if (pageNum != null && pageSize != null) { |
| | | return AjaxResult.success(tmsFinanceDetailService.getTmsFinanceDetailListPage(dispatchId, pageNum, pageSize)); |
| | | } |
| | | return AjaxResult.success(tmsFinanceDetailService.getTmsFinanceDetailList(dispatchId)); |
| | | } |
| | | |