Merge remote-tracking branch 'origin/main'

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();

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<Integer> parts;
+
     private String remarks;
 }

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<EbikeBikeOrderMapper,
     @Resource
     private EbikeOrderFileMapper ebikeOrderFileMapper;
 
-    @Resource
-    private EbikeOrderPartMapper ebikeOrderPartMapper;
-
     @Resource
     private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper;
 
@@ -670,10 +666,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                     .where(EBIKE_ORDER_FILE.ORDER_ID.eq(bikeOrder.getOrderId()));
             List<String> list = ebikeOrderFileMapper.selectListByQueryAs(queryWrapper, String.class);
             
-            queryWrapper.clear();
+            List<Integer> parts = inspectionVo.getParts();
-            queryWrapper.select(EBIKE_ORDER_PART.ORDER_PART)
-                    .where(EBIKE_ORDER_PART.ORDER_ID.eq(bikeOrder.getOrderId()));
-            List<Integer> parts = ebikeOrderPartMapper.selectListByQueryAs(queryWrapper, Integer.class);
 
             EbikeBikeOrder ebikeBikeOrder = EbikeBikeOrder.builder()
                     .bikeCode(bikeInfo.getBikeCode())