车辆管理

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -420,7 +420,7 @@ public class KwfTruckController {
      */
     @Operation(summary = "保存车辆", description = "保存车辆")
     @PostMapping("/saveTruck")
-    public BaseResult saveTruck(TruckSaveParam param){
+    public BaseResult saveTruck(@RequestBody @Valid TruckSaveParam param){
         truckService.saveTruck(param);
         return BaseResult.success();
     }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/reponse/TruckDetailResp.java

@@ -71,7 +71,7 @@ public class TruckDetailResp implements Serializable {
      * 能源类型(1-传统能源车辆、2-新能源车辆)
      */
     @Schema(description = "能源类型(1-传统能源车辆、2-新能源车辆)")
-    private int energyType;
+    private Integer energyType;
 
     /**
      * 能源类型描述
@@ -83,7 +83,7 @@ public class TruckDetailResp implements Serializable {
      * 排放标准(1-国四、2-国五、3-国六)
      */
     @Schema(description = "排放标准(1-国四、2-国五、3-国六)")
-    private int eev;
+    private Integer eev;
 
     /**
      * 排放标准描述
@@ -95,7 +95,7 @@ public class TruckDetailResp implements Serializable {
      * 状态(0-正常、1-停用、2-待审核、3-审核驳回、4-黑名单)
      */
     @Schema(description = "状态(0-正常、1-停用、2-待审核、3-审核驳回、4-黑名单)")
-    private int status;
+    private Integer status;
 
     /**
      * 状态描述

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckQueryParam.java

@@ -41,7 +41,7 @@ public class TruckQueryParam extends PageReq implements Serializable {
      * 能源类型(1-传统能源车辆、2-新能源车辆)
      */
     @Schema(description = "能源类型(1-传统能源车辆、2-新能源车辆)")
-    private Integer energyTyp;
+    private Integer energyType;
 
     /**
      * 排放标准(1-国四、2-国五、3-国六)

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

@@ -2077,10 +2077,10 @@ public class KwfTruckService {
 
         LambdaQueryWrapper<KwfTruck> wrapper = Wrappers.<KwfTruck>lambdaQuery()
                 .like(StringUtils.isNotBlank(param.getTruckNo()), KwfTruck::getTruckNo, param.getTruckNo())
-                .eq(KwfTruck::getType, param.getType())
-                .eq(KwfTruck::getCarAxis, param.getCarAxis())
-                .eq(KwfTruck::getEnergyType, param.getEnergyTyp())
-                .eq(KwfTruck::getEev, param.getEev());
+                .eq(param.getType() != null, KwfTruck::getType, param.getType())
+                .eq(param.getCarAxis() != null, KwfTruck::getCarAxis, param.getCarAxis())
+                .eq(param.getEnergyType() != null, KwfTruck::getEnergyType, param.getEnergyType())
+                .eq(param.getEev() != null, KwfTruck::getEev, param.getEev());
         //黑名单
         if (param.getStatus() != null) {
             if (Objects.equals(param.getStatus(), 4)) {
@@ -2097,7 +2097,7 @@ public class KwfTruckService {
         wrapper.orderByDesc(KwfTruck::getCreateTime)
                 .orderByDesc(KwfTruck::getId);
 
-        //查询铲车订单
+        //查询车辆信息数据
         Page<KwfTruck> pageByStatus = kwfTruckRepository.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<KwfTruck> records = pageByStatus.getRecords();
         if (CollectionUtils.isEmpty(records)) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -221,7 +221,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      */
     private RDriverVo checkDriver(OrderCirculateTakingQueryParam param) {
         RDriverVo driverVo = remoteFleetService.findDriver(param.getDriverId());
-        if (driverVo == null || driverVo.getStatus() == Global.NUMERICAL_ONE) {
+        if (driverVo == null || Objects.equals(driverVo.getStatus(), Global.NUMERICAL_ONE)) {
             throw new BusinessPlatfromException(ErrorCodeEnum.DRIVER_STATUS_ERROR, "当前司机已锁定");
         }
         //校验是否是自动派单