巡检生成逻辑

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

@@ -120,4 +120,10 @@ public class EbikeBikeOrder implements Serializable {
      * 是否故障误报
      */
     private Boolean faultFalseAlarm;
+
+
+    /**
+     * 是否故障误报
+     */
+    private Boolean isUserReporting;
 }

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

@@ -28,4 +28,6 @@ public class InspectionSwapOrderVo {
     private List<String> fileUrls;
 
     private String remarks;
+
+    private Boolean isUserReporting;
 }

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

@@ -163,6 +163,11 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .remarks(inspectionSwapOrderVo.getRemarks())
                 .handleState(OrderHandleState.UNPROCESSED)
                 .build();
+        if (inspectionSwapOrderVo.getIsUserReporting()!=null && inspectionSwapOrderVo.getIsUserReporting()){
+            ebikeBikeOrder.setIsUserReporting(Boolean.TRUE);
+        }else {
+            ebikeBikeOrder.setIsUserReporting(Boolean.FALSE);
+        }
         this.mapper.insert(ebikeBikeOrder);
         Long orderId = ebikeBikeOrder.getOrderId();
         List<Integer> parts = inspectionSwapOrderVo.getParts();
@@ -541,7 +546,16 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                                                 .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
                                                 .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
                                 ))
-                                .then(true)
+                                .then(
+                                        QueryWrapper.create()
+                                                .select(EBIKE_BIKE_ORDER.IS_USER_REPORTING)
+                                                .from(EBIKE_BIKE_ORDER)
+                                                .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
+                                                .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
+                                                // 如果有多个巡检工单，可以添加排序和 limit 1
+                                                .orderBy(EBIKE_BIKE_ORDER.CREATED_AT.desc())
+                                                .limit(1)
+                                )
                                 .else_(false)
                                 .end().as(EbikeOrderBikeListDto::getHasInspectionOrder),
                         // 判断是否有换电工单