Merge remote-tracking branch 'origin/main'

ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignInspectionSwapOrderVo.java

@@ -26,4 +26,9 @@ public class FeignInspectionSwapOrderVo {
 
     @NotNull(message = "故障部位图片不能为空")
     private List<String> fileUrls;
+
+    /**
+     * 故障内容
+     */
+    private String remarks;
 }

ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java

@@ -52,6 +52,24 @@ public class EbikeBikeOrderController {
         return JsonResult.success(orderPage);
     }
 
+    /**
+     * 工单详情。
+     *
+     * @param page 分页对象
+     * @return 分页对象
+     */
+    @GetMapping("getInfo")
+    public JsonResult<?> getInfo(PageParam page, Integer orderType,String bikeCode) {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .select(EBIKE_BIKE_INFO.LOCATION,EBIKE_BIKE_ORDER.ALL_COLUMNS)
+                .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(BikeOrderHandleState.UNPROCESSED))
+                .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType, Objects.nonNull(orderType)))
+                .where(EBIKE_BIKE_ORDER.BIKE_CODE.like(bikeCode, StringUtil.hasText(bikeCode)))
+                .leftJoin(EBIKE_BIKE_INFO).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_BIKE_ORDER.BIKE_CODE));
+        Page<EbikeBikeOrderPageDto> orderPage = ebikeBikeOrderService.pageAs(page.getPage(), queryWrapper, EbikeBikeOrderPageDto.class);
+        return JsonResult.success(orderPage);
+    }
+
     /**
      * 生成换电工单。
      *

ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java

@@ -112,4 +112,9 @@ public class EbikeBikeOrder implements Serializable {
      */
     private Long siteId;
 
+    /**
+     * 故障描述
+     */
+    private String remarks;
+
 }

ebike-operations/src/main/java/com/cdzy/operations/model/vo/InspectionSwapOrderVo.java

@@ -26,4 +26,6 @@ public class InspectionSwapOrderVo {
 
     @NotNull(message = "故障部位图片不能为空")
     private List<String> fileUrls;
+
+    private String remarks;
 }

ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java

@@ -98,6 +98,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .orderCode(snowFlakeIDKeyGenerator.nextId())
                 .orderType(BikeOrderType.INSPECTION)
                 .operatorId(bikeInfo.getOperatorId())
+                .remarks(inspectionSwapOrderVo.getRemarks())
                 .build();
         this.mapper.insert(ebikeBikeOrder);
         Long orderId = ebikeBikeOrder.getOrderId();