chenxiaofei 2 месяцев назад
Родитель
Сommit
b4a45e6963

+ 6 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckDetailParam.java

@@ -21,9 +21,14 @@ public class TruckDetailParam implements Serializable {
     /**
      * 车辆主键id
      */
-    @NotNull(message = "车辆id不能为空")
     @Schema(description = "车辆主键id")
     private Long id;
 
+    /**
+     * 车牌号
+     */
+    @Schema(description = "车牌号")
+    private String truckNo;
+
 
 }

+ 7 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -2146,8 +2146,14 @@ public class KwfTruckService {
      */
     public TruckDetailResp truckDetail(TruckDetailParam param) {
         log.info("查询司机详情,id:{}", JSON.toJSONString(param));
+        if (param.getId() == null && (param.getTruckNo() == null || param.getTruckNo().trim().isEmpty())) {
+            return new TruckDetailResp();
+        }
+        
         KwfTruck truck = kwfTruckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(KwfTruck::getId, param.getId()));
+                .eq(param.getId() != null, KwfTruck::getId, param.getId())
+                .eq(param.getTruckNo() != null && !param.getTruckNo().trim().isEmpty(), KwfTruck::getTruckNo, param.getTruckNo())
+                .last("limit 1"));
         if (truck == null) {
             return new TruckDetailResp();
         }