feat：行车日志增加字段、日志类型调整

src/main/java/com/aoyang/tms/common/WorkLogTypeEnum.java

@@ -43,21 +43,21 @@ public enum WorkLogTypeEnum {
 
     LEAVE_UNLOAD_SPOT(59, "车辆离开\"卸车点围栏\""),
 
-    UNLOAD_COMPLETE(30, "完成 卸车运单"),
+    UNLOAD_COMPLETE(60, "完成 卸车运单"),
 
 
-    RETURN_POINT_ARRIVED(80, "到达 收车点，开始\"收车后检查\""),
+    RETURN_POINT_ARRIVED(70, "到达 收车点，开始\"收车后检查\""),
 
-    CLOSED(90, "完成\"收车后检查\"，行车结束"),
+    CLOSED(80, "完成\"收车后检查\"，行车结束"),
 
 
-    REPAIR_START(60, "开始\"途中维修\""),
+    REPAIR_START(91, "开始\"途中维修\""),
 
-    REPAIR_END(61, "结束\"途中维修\""),
+    REPAIR_END(92, "结束\"途中维修\""),
 
-    REST_START(62, "开始\"途中休息\""),
+    REST_START(93, "开始\"途中休息\""),
 
-    REST_END(63, "结束\"途中休息\""),
+    REST_END(94, "结束\"途中休息\""),
 
     ;
 

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

@@ -40,7 +40,10 @@ public class WorkLog implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long cycleId;
 
-    @ApiModelProperty(value = "日志类型")
+    @ApiModelProperty(value = "日志类型：1-执行装车运单 2-车辆启动 10-完成出车前检查 20-到达装车点 21-开始装车 22-结束装车" +
+            "28-进入装车点围栏 29-离开装车点围栏 30-完成装车运单 40-执行卸车运单 50-到达卸车点 51-开始卸车 52-结束卸车" +
+            "58-进入卸车点围栏 59-离开卸车点围栏 60-完成卸车运单 70-到达收车点 80-完成收车后检查" +
+            "91-开始途中维修 92-结束途中维修 93-开始途中休息 94-结束途中休息")
     @TableField("type")
     private Integer type;
 
@@ -82,6 +85,26 @@ public class WorkLog implements Serializable {
     @TableField("trailer_number")
     private String trailerNumber;
 
+    @ApiModelProperty(value = "成果报备皮重")
+    @TableField("pi_weight")
+    private String piWeight;
+
+    @ApiModelProperty(value = "成果报备毛重")
+    @TableField("mao_weight")
+    private String maoWeight;
+
+    @ApiModelProperty(value = "成果报备净重")
+    @TableField("jing_weight")
+    private String jingWeight;
+
+    @ApiModelProperty(value = "开始时间")
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")
     @JsonFormat(shape = JsonFormat.Shape.STRING)