feat:里程数字段类型修改String->Integer

src/main/java/com/aoyang/tms/controller/WorkOrderManageController.java

@@ -104,6 +104,8 @@ public class WorkOrderManageController {
             vo.setUnloadCount(workOrderService.count(queryWrapper));
             vo.setStartTime(workCycle.getStartTime());
             vo.setEndTime(workCycle.getEndTime());
+            vo.setStartTrip(workCycle.getStartTrip());
+            vo.setEndTrip(workCycle.getEndTrip());
             resultList.add(vo);
         }
         return new Result<>(resultList);

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -257,7 +257,7 @@ public class WorkerController {
     @PostMapping("/add_truck_check_info")
     public Result add_truck_check_info(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody TruckCheckInfo truckCheckInfo) {
         log.info("上报车辆检查信息,/tms/worker/add_truck_check_info，参数:{}", JSON.toJSONString(truckCheckInfo));
-        if (truckCheckInfo == null || truckCheckInfo.getType() == null || truckCheckInfo.getTruckId() == null || StringUtils.isBlank(truckCheckInfo.getTrip()) || StringUtils.isBlank(truckCheckInfo.getCheckUrl()) || StringUtils.isBlank(truckCheckInfo.getTripUrl())) {
+        if (truckCheckInfo == null || truckCheckInfo.getType() == null || truckCheckInfo.getTruckId() == null || truckCheckInfo.getTrip() == null || StringUtils.isBlank(truckCheckInfo.getCheckUrl()) || StringUtils.isBlank(truckCheckInfo.getTripUrl())) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;
@@ -327,7 +327,7 @@ public class WorkerController {
     @PostMapping("/start_order")
     public Result startOrder(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
         log.info("开始执行运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getId() == null || StringUtils.isBlank(workOrder.getStartTrip()) || StringUtils.isBlank(workOrder.getStartTripUrl())) {
+        if (workOrder == null || workOrder.getId() == null || workOrder.getStartTrip() == null || StringUtils.isBlank(workOrder.getStartTripUrl())) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;
@@ -358,7 +358,7 @@ public class WorkerController {
         }
         //出车检查
         if (truckCheckInfo.getType() == 2) {
-            if (StringUtils.isBlank(truckCheckInfo.getTrip()) || StringUtils.isBlank(truckCheckInfo.getTripUrl()) || StringUtils.isBlank(truckCheckInfo.getCheckUrl())) {
+            if (truckCheckInfo.getTrip() == null || StringUtils.isBlank(truckCheckInfo.getTripUrl()) || StringUtils.isBlank(truckCheckInfo.getCheckUrl())) {
                 return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
             }
         }

src/main/java/com/aoyang/tms/controller/vo/AddWorkOrderVO.java

@@ -91,7 +91,7 @@ public class AddWorkOrderVO implements Serializable {
     private String note;
 
     @ApiModelProperty(value = "结算里程（km）")
-    private String settleTrip;
+    private Integer settleTrip;
 
 
 }

src/main/java/com/aoyang/tms/controller/vo/TruckHistoryTripVO.java

@@ -36,4 +36,10 @@ public class TruckHistoryTripVO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
+    @ApiModelProperty(value = "开始执行运单时车辆里程数")
+    private Integer startTrip;
+
+    @ApiModelProperty(value = "完成行车周期时车辆里程数")
+    private Integer endTrip;
+
 }

src/main/java/com/aoyang/tms/entity/TruckCheckInfo.java

@@ -81,7 +81,7 @@ public class TruckCheckInfo implements Serializable {
 
     @ApiModelProperty(value = "车辆里程数")
     @TableField("trip")
-    private String trip;
+    private Integer trip;
 
     @ApiModelProperty(value = "车辆里程数照片url")
     @TableField("trip_url")

src/main/java/com/aoyang/tms/entity/WorkCycle.java

@@ -111,11 +111,11 @@ public class WorkCycle implements Serializable {
 
     @ApiModelProperty(value = "开始执行运单时车辆里程数照片url")
     @TableField("start_trip")
-    private String startTrip;
+    private Integer startTrip;
 
     @ApiModelProperty(value = "周期完成时车辆里程数")
     @TableField("end_trip")
-    private String endTrip;
+    private Integer endTrip;
 
     @ApiModelProperty(value = "司机1签字url")
     @TableField("driver_one_sign_url")

src/main/java/com/aoyang/tms/entity/WorkOrder.java

@@ -174,7 +174,7 @@ public class WorkOrder implements Serializable {
 
     @ApiModelProperty(value = "开始执行运单时车辆里程数")
     @TableField("start_trip")
-    private String startTrip;
+    private Integer startTrip;
 
     @ApiModelProperty(value = "开始执行运单时车辆里程数照片url")
     @TableField("start_trip_url")
@@ -182,7 +182,7 @@ public class WorkOrder implements Serializable {
 
     @ApiModelProperty(value = "装卸车等待时车辆里程数")
     @TableField("end_trip")
-    private String endTrip;
+    private Integer endTrip;
 
     @ApiModelProperty(value = "装卸车等待时车辆里程数数照片url")
     @TableField("end_trip_url")
@@ -234,7 +234,7 @@ public class WorkOrder implements Serializable {
 
     @ApiModelProperty(value = "结算里程（km）")
     @TableField("settle_trip")
-    private String settleTrip;
+    private Integer settleTrip;
 
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")