|
@@ -50,7 +50,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
|
|
|
BeanUtils.copyProperties(workOrder, workLog);
|
|
BeanUtils.copyProperties(workOrder, workLog);
|
|
|
workLog.setId(null);
|
|
workLog.setId(null);
|
|
|
// 日志内容
|
|
// 日志内容
|
|
|
- String content = "里程数:" + workOrder.getStartTrip() + " 运单号:" + workOrder.getOrderNo();
|
|
|
|
|
|
|
+ String content = "里程数:" + workOrder.getStartTrip() + " <br/>运单号:" + workOrder.getOrderNo();
|
|
|
workLog.setUrl(workOrder.getStartTripUrl());
|
|
workLog.setUrl(workOrder.getStartTripUrl());
|
|
|
workLog.setNote(content);
|
|
workLog.setNote(content);
|
|
|
workLog.setOrderId(workOrder.getId()+"");
|
|
workLog.setOrderId(workOrder.getId()+"");
|
|
@@ -81,7 +81,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
|
|
|
// 日志内容
|
|
// 日志内容
|
|
|
String content = "";
|
|
String content = "";
|
|
|
workLog.setUrl(args[0]);
|
|
workLog.setUrl(args[0]);
|
|
|
- workLog.setNote(content);
|
|
|
|
|
|
|
+ workLog.setNote("用时(" + DateUtils.betweenTime(workOrder.getExecuteTime(), LocalDateTime.now()) + ")");
|
|
|
workLog.setOrderId(workOrder.getId()+"");
|
|
workLog.setOrderId(workOrder.getId()+"");
|
|
|
workLog.setCreaterName(workLog.getCreaterName());
|
|
workLog.setCreaterName(workLog.getCreaterName());
|
|
|
workLog.setCreateDate(LocalDateTime.now());
|
|
workLog.setCreateDate(LocalDateTime.now());
|
|
@@ -181,7 +181,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
|
|
|
BeanUtils.copyProperties(workOrder, workLog);
|
|
BeanUtils.copyProperties(workOrder, workLog);
|
|
|
workLog.setId(null);
|
|
workLog.setId(null);
|
|
|
// 日志内容
|
|
// 日志内容
|
|
|
- String content = "里程数:" + workOrder.getEndTrip() + " 运单号:" + workOrder.getOrderNo();
|
|
|
|
|
|
|
+ String content = "里程数:" + workOrder.getEndTrip() + " <br/>运单号:" + workOrder.getOrderNo();
|
|
|
workLog.setUrl(workOrder.getStartTripUrl());
|
|
workLog.setUrl(workOrder.getStartTripUrl());
|
|
|
workLog.setNote(content);
|
|
workLog.setNote(content);
|
|
|
workLog.setOrderId(workOrder.getId()+"");
|
|
workLog.setOrderId(workOrder.getId()+"");
|