| | |
| | | |
| | | @RequestMapping(value = "/signFor", method = RequestMethod.POST) |
| | | @ApiOperation(value = "签收") |
| | | public Object signFor(String orderId,int status,String content,String customerReceiveId) { |
| | | public Object signFor(String orderId,int status,String content,String customerReceiveId,int time,String carId) { |
| | | if(status==1){ |
| | | if(StrUtil.isEmpty(customerReceiveId)){ |
| | | return ResultUtil.error("正常签收,接货人id必填"); |
| | | } |
| | | } |
| | | |
| | | if(StrUtil.isEmpty(carId)){ |
| | | return ResultUtil.error("车辆id不能为空"); |
| | | } |
| | | OrderTask orderTask = iOrderTaskService.getById(orderId); |
| | | orderTask.setStatus(status); |
| | | orderTask.setUserId(securityUtil.getCurrUser().getId()); |
| | | orderTask.setTime(time); |
| | | orderTask.setCarId(carId); |
| | | if(StrUtil.isNotEmpty(customerReceiveId)){ |
| | | orderTask.setCustomerReceiveId(customerReceiveId); |
| | | } |
| | |
| | | @ApiOperation(value = "分页获取") |
| | | public Result<IPage<OrderTask>> getByPage(PageVo page) { |
| | | |
| | | IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page)); |
| | | IPage<OrderTask> data = iOrderTaskService.page2(PageUtil.initMpPage(page)); |
| | | return new ResultUtil<IPage<OrderTask>>().setData(data); |
| | | } |
| | | |