feat:行车日志调整

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

@@ -127,5 +127,8 @@ public class WorkLog implements Serializable {
     @TableField("create_date")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "图片地址url")
+    @TableField("url")
+    private String url;
 
 }

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

@@ -50,19 +50,23 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 日志内容
-            String content = "里程数：" + workOrder.getStartTrip() + "  < a href='" + workOrder.getStartTripUrl()
-                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>"
-                    + " 运单号：" + workOrder.getOrderNo();
+            String content = "里程数：" + workOrder.getStartTrip() + " 运单号：" + workOrder.getOrderNo();
+            workLog.setUrl(workOrder.getStartTripUrl());
             workLog.setNote(content);
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_ORDER_NEW_START)) {
             // 执行新的装车运单，原行车周期结束
+            if (workOrder == null) {
+                log.error("记录执行装车订单日志错误：运单不存在");
+                return false;
+            }
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 日志内容
             workLog.setNote("");
+            workLog.setUrl(workOrder.getStartTripUrl());
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
@@ -75,8 +79,8 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 日志内容
-            String content = "< a href='" + args[0]
-                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>检查表</ a>";
+            String content = "";
+            workLog.setUrl(args[0]);
             workLog.setNote(content);
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
@@ -90,8 +94,8 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 日志内容
-            String content = "装车排队号：" + workOrder.getQueueNo() + "  < a href='" + workOrder.getStartTripUrl()
-                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>";
+            String content = "装车排队号：" + workOrder.getQueueNo();
+            workLog.setUrl(workOrder.getStartTripUrl());
             workLog.setNote(content);
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
@@ -130,8 +134,8 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setId(null);
             workLog.setCycleId(workOrder.getCycleId());
             // 日志内容
-            String content = "装车净重：" + workOrder.getJingWeight() + "  < a href='" + workOrder.getWeightingListUrl()
-                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>磅单信息</ a>";
+            String content = "装车净重：" + workOrder.getJingWeight();
+            workLog.setUrl(workOrder.getWeightingListUrl());
             workLog.setNote(content);
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreateDate(LocalDateTime.now());
@@ -144,9 +148,8 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 日志内容
-            String content = "里程数：" + workOrder.getEndTrip() + "  < a href='" + workOrder.getStartTripUrl()
-                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>"
-                    + " 运单号：" + workOrder.getOrderNo();
+            String content = "里程数：" + workOrder.getEndTrip() + " 运单号：" + workOrder.getOrderNo();
+            workLog.setUrl(workOrder.getStartTripUrl());
             workLog.setNote(content);
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreaterName(workLog.getCreaterName());
@@ -159,6 +162,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             }
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
+            workLog.setUrl(workOrder.getWeightingListUrl());
             workLog.setOrderId(workOrder.getId()+"");
             workLog.setCycleId(workOrder.getCycleId());
             // 日志内容
@@ -172,11 +176,8 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
                 return false;
             }
             // 日志内容
-            String content = "< a href='" + args[0]
-                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>《检查表》</a>"
-                    + " 里程数：" + args[1]
-                    + "  < a href='" + workOrder.getStartTripUrl()
-                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</a>";
+            String content = " 里程数：" + workOrder.getEndTrip();
+            workLog.setUrl(workOrder.getEndTripUrl());
             workLog.setNote(content);
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_CANCELED) || logType.equals(WorkLogTypeEnum.UNLOAD_CANCELED)) {