From 21eaf7d2aae009dd11c3d7f56af2a42466fd3103b37a2a7875d94122655d232a Mon Sep 17 00:00:00 2001 From: PC <2413103649@qq.com> Date: Tue, 20 Jan 2026 13:54:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeBikeOrderController.java | 2 +- .../cdzy/operations/model/vo/DoneInspectionVo.java | 3 +++ .../service/impl/EbikeBikeOrderServiceImpl.java | 11 ++--------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java index d149b6f..ce88b79 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java @@ -350,7 +350,7 @@ public class EbikeBikeOrderController { * * @return 操作结果 */ - @GetMapping("batchFinishDispatch") + @PostMapping("batchFinishDispatch") public JsonResult batchFinishDispatch(@RequestBody @Validated EbikeBatchDispatchVo dispatchVo) { ebikeBikeOrderService.batchFinishDispatch(dispatchVo); return JsonResult.success(); diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneInspectionVo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneInspectionVo.java index 558656b..edf03ee 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneInspectionVo.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneInspectionVo.java @@ -28,5 +28,8 @@ public class DoneInspectionVo { @NotNull(message = "是否上报故障不能为空") private Boolean isFault; + @NotNull(message = "巡检目标不能为空") + private List parts; + private String remarks; } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java index 84d1130..9f58101 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java @@ -43,7 +43,6 @@ import static com.cdzy.operations.model.entity.table.EbikeBikeOrderTableDef.EBIK import static com.cdzy.operations.model.entity.table.EbikeBorrowBatteryRecordTableDef.EBIKE_BORROW_BATTERY_RECORD; import static com.cdzy.operations.model.entity.table.EbikeEcuInfoTableDef.EBIKE_ECU_INFO; import static com.cdzy.operations.model.entity.table.EbikeOrderFileTableDef.EBIKE_ORDER_FILE; -import static com.cdzy.operations.model.entity.table.EbikeOrderPartTableDef.EBIKE_ORDER_PART; import static com.cdzy.operations.model.entity.table.EbikeSiteTableDef.EBIKE_SITE; /** @@ -102,9 +101,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl list = ebikeOrderFileMapper.selectListByQueryAs(queryWrapper, String.class); - - queryWrapper.clear(); - queryWrapper.select(EBIKE_ORDER_PART.ORDER_PART) - .where(EBIKE_ORDER_PART.ORDER_ID.eq(bikeOrder.getOrderId())); - List parts = ebikeOrderPartMapper.selectListByQueryAs(queryWrapper, Integer.class); + + List parts = inspectionVo.getParts(); EbikeBikeOrder ebikeBikeOrder = EbikeBikeOrder.builder() .bikeCode(bikeInfo.getBikeCode())