feat：行车日志增加日志类型

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

@@ -40,6 +40,10 @@ public class WorkLog implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long cycleId;
 
+    @ApiModelProperty(value = "日志类型")
+    @TableField("type")
+    private Integer type;
+
     @ApiModelProperty(value = "标题")
     @TableField("title")
     private String title;

src/main/java/com/aoyang/tms/service/impl/WorkLogServiceImpl.java

@@ -23,11 +23,12 @@ import java.time.LocalDateTime;
 public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> implements WorkLogService {
 
     @Override
-    public Boolean logWorkCycleInfo(WorkLogTypeEnum type, WorkOrder workOrder, String ... args) {
+    public Boolean logWorkCycleInfo(WorkLogTypeEnum logType, WorkOrder workOrder, String ... args) {
         WorkLog workLog = new WorkLog();
-        workLog.setTitle(type.workLogTitle);
-        if (type.equals(WorkLogTypeEnum.ENTER_LOAD_SPOT) || type.equals(WorkLogTypeEnum.LEAVE_LOAD_SPOT)
-                || type.equals(WorkLogTypeEnum.ENTER_UNLOAD_SPOT) || type.equals(WorkLogTypeEnum.LEAVE_UNLOAD_SPOT)) {
+        workLog.setTitle(logType.workLogTitle);
+        workLog.setType(logType.type);
+        if (logType.equals(WorkLogTypeEnum.ENTER_LOAD_SPOT) || logType.equals(WorkLogTypeEnum.LEAVE_LOAD_SPOT)
+                || logType.equals(WorkLogTypeEnum.ENTER_UNLOAD_SPOT) || logType.equals(WorkLogTypeEnum.LEAVE_UNLOAD_SPOT)) {
             // 进入离开围栏日志
             if (workOrder == null) {
                 log.error("记录围栏行车日志错误：运单不存在");
@@ -36,7 +37,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 日志内容
-            workLog.setNote(type.workLogTitle + " " + workOrder.getSpotName());
+            workLog.setNote(logType.workLogTitle + " " + workOrder.getSpotName());
             workLog.setCreaterName("自动上报");
             workLog.setCreateDate(workOrder.getType() == 1? workOrder.getEnterTime() : workOrder.getLeaveTime());
         } else if ( 1 == 2) {
@@ -52,7 +53,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setId(null);
             // 行车周期cycleId必传
             workLog.setCycleId(Long.parseLong(args[0]));
-            workLog.setNote(type.workLogTitle);
+            workLog.setNote(logType.workLogTitle);
             workLog.setCreateDate(LocalDateTime.now());
         }