|
|
@@ -23,7 +23,7 @@ import java.time.LocalDateTime;
|
|
|
public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> implements WorkLogService {
|
|
|
|
|
|
@Override
|
|
|
- public Boolean logWorkCycleInfo(WorkLogTypeEnum type, WorkOrder workOrder) {
|
|
|
+ public Boolean logWorkCycleInfo(WorkLogTypeEnum type, 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)
|
|
|
@@ -42,6 +42,18 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
|
|
|
} else if ( 1 == 2) {
|
|
|
// TODO others
|
|
|
workLog.setNote("lalallala");
|
|
|
+ } else {
|
|
|
+ // 通用处理
|
|
|
+ if (workOrder == null) {
|
|
|
+ log.error("记录行车日志错误:运单不存在");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ BeanUtils.copyProperties(workOrder, workLog);
|
|
|
+ workLog.setId(null);
|
|
|
+ // 行车周期cycleId必传
|
|
|
+ workLog.setCycleId(Long.parseLong(args[0]));
|
|
|
+ workLog.setNote(type.workLogTitle);
|
|
|
+ workLog.setCreateDate(LocalDateTime.now());
|
|
|
}
|
|
|
|
|
|
return save(workLog);
|