From 85c4410b0948799a93f19f345b4ed18c253c89f3 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 03 九月 2024 10:26:33 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java index 78b4ddd..433728e 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java @@ -31,7 +31,7 @@ private TParkingLotService parkingLotService; @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "列表") - @GetMapping(value = "/page") + @PostMapping(value = "/page") public R<Page<TParkingRecord>> page(@RequestBody ParkingRecordPageQuery query) { Page<TParkingRecord> page = parkingRecordService.lambdaQuery().ge(query.getStart() != null, TParkingRecord::getCreateTime, query.getStart()) .le(query.getEnd() != null, TParkingRecord::getCreateTime, query.getEnd()) @@ -42,9 +42,22 @@ for (TParkingRecord record : page.getRecords()) { record.setName(parkingLotService.getById(record.getParkingLotId()).getName()); + record.setUid(record.getId().toString()); } return R.ok(page); } + @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "出场") + @GetMapping(value = "/out") + public R out(Long id) { + TParkingRecord byId = parkingRecordService.getById(id); + byId.setStatus(2); + parkingRecordService.updateById(byId); + return R.ok(); + + } + + + } -- Gitblit v1.7.1