派车识别新增车辆类型

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/QueryFleetResp.java

@@ -121,5 +121,17 @@ public class QueryFleetResp  implements Serializable {
          */
         @Schema(description = "车辆轴数")
         private String axleNum;
+
+        /**
+         * 车辆类别(牵引车、货车)
+         */
+        @Schema(description = "车辆类别(牵引车、货车)")
+        private Integer type;
+
+        /**
+         * 车辆类别描述
+         */
+        @Schema(description = "车辆类别描述")
+        private String typeDesc;
     }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/TruckValidateVo.java

@@ -77,4 +77,16 @@ public class TruckValidateVo implements Serializable {
      */
     @Schema(description = "企业名称")
     private String entName;
+
+    /**
+     * 车辆类别(牵引车、货车)
+     */
+    @Schema(description = "车辆类别(牵引车、货车)")
+    private Integer type;
+
+    /**
+     * 车辆类别描述
+     */
+    @Schema(description = "车辆类别描述")
+    private String typeDesc;
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfFleetService.java

@@ -22,6 +22,7 @@ import com.sckw.fleet.model.KwfFleetTruck;
 import com.sckw.fleet.model.KwfTruck;
 import com.sckw.fleet.model.TmsTruckAxleNum;
 import com.sckw.fleet.model.dto.KwfFleetDto;
+import com.sckw.fleet.model.enums.TruckTypeEnum;
 import com.sckw.fleet.model.request.QueryFleetReq;
 import com.sckw.fleet.model.vo.KwfFleetTruckCountVo;
 import com.sckw.fleet.model.vo.KwfFleetVo;
@@ -337,6 +338,8 @@ public class KwfFleetService {
         truckInfo.setTruckId(truck.getId());
         truckInfo.setTruckNo(truck.getTruckNo());
         truckInfo.setAxleNum(truckAxleNum.getName());
+        truckInfo.setType(truck.getType());
+        truckInfo.setTypeDesc(TruckTypeEnum.getName(truck.getType()));
         return truckInfo;
     }
 

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

@@ -2025,7 +2025,9 @@ public class KwfTruckService {
             builder.exists(true)
                    .truckId(truck.getId())
                    .carAxis(axleNum.getName())
-                   .entId(ent.getId());
+                   .entId(ent.getId())
+                    .type(truck.getType())
+                    .typeDesc(TruckTypeEnum.getName(truck.getType()));
 
             // 获取企业名称
             if (ent != null) {
@@ -2145,12 +2147,12 @@ public class KwfTruckService {
     }
 
     /**
-     * 分页查询铲车订单
+     * 车辆详情
      * @param param
      * @return
      */
     public TruckDetailResp truckDetail(TruckDetailParam param) {
-        log.info("查询司机详情，id：{}", JSON.toJSONString(param));
+        log.info("查询车辆详情，id：{}", JSON.toJSONString(param));
         if (param.getId() == null && (param.getTruckNo() == null || param.getTruckNo().trim().isEmpty())) {
             return new TruckDetailResp();
         }