feat:行车日志修改

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

@@ -40,7 +40,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setNote(logType.workLogTitle + " " + workOrder.getSpotName());
             workLog.setCreaterName("自动上报");
             workLog.setCreateDate(workOrder.getType() == 1? workOrder.getEnterTime() : workOrder.getLeaveTime());
-        } else if (logType.equals(WorkLogTypeEnum.START) || logType.equals(WorkLogTypeEnum.UNLOAD_ORDER_START)) {
+        } else if (logType.equals(WorkLogTypeEnum.LOAD_ORDER_START) || logType.equals(WorkLogTypeEnum.UNLOAD_ORDER_START)) {
             // 执行装车运单/卸车运单
             if (workOrder == null) {
                 log.error("记录执行装车订单日志错误：运单不存在");
@@ -72,22 +72,21 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
         } else if (logType.equals(WorkLogTypeEnum.LOAD_POINT_ARRIVED)) {
             // 到达装车点，开始装车等待
             if (workOrder == null) {
-                log.error("记录执行装车订单日志错误：运单不存在");
+                log.error("记录装车等待日志错误：运单不存在");
                 return false;
             }
             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.getQueueNo() + "  < a href='" + workOrder.getStartTripUrl()
+                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>";
             workLog.setNote(content);
             workLog.setCreaterName(workLog.getCreaterName());
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.LOAD_START)) {
             // 开始作业，成果上报开始
             if (workOrder == null) {
-                log.error("记录执行装车订单日志错误：运单不存在");
+                log.error("记录开始装车日志错误：运单不存在");
                 return false;
             }
             BeanUtils.copyProperties(workOrder, workLog);
@@ -98,7 +97,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
         } else if (logType.equals(WorkLogTypeEnum.LOAD_END)) {
             // 结束作业，成果上报完成
             if (workOrder == null) {
-                log.error("记录执行装车订单日志错误：运单不存在");
+                log.error("记录结束作业订单日志错误：运单不存在");
                 return false;
             }
             BeanUtils.copyProperties(workOrder, workLog);
@@ -138,7 +137,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
         } else if (logType.equals(WorkLogTypeEnum.UNLOAD_COMPLETE)) {
             // 报备完成，结束卸车
             if (workOrder == null) {
-                log.error("记录执行装车订单日志错误：运单不存在");
+                log.error("记录行车日志错误：运单不存在");
                 return false;
             }
             BeanUtils.copyProperties(workOrder, workLog);
@@ -147,9 +146,21 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             // 日志内容
             workLog.setNote("结束卸车");
             workLog.setCreateDate(LocalDateTime.now());
-        } else if ( 1 == 2) {
-            // TODO others
-            workLog.setNote("lalallala");
+        } else if (logType.equals(WorkLogTypeEnum.CLOSED)) {
+            // 完成收车后检查
+            workLog.setCycleId(workOrder.getCycleId());
+            if (args.length < 2) {
+                log.error("记录行车日志错误：参数错误");
+                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>";
+            workLog.setNote(content);
+            workLog.setCreateDate(LocalDateTime.now());
         } else {
             // 通用处理
             if (workOrder == null) {
@@ -160,7 +171,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setId(null);
             // 行车周期cycleId必传
             workLog.setCycleId(workOrder.getCycleId());
-            workLog.setNote(logType.workLogTitle);
+            workLog.setNote(null);
             workLog.setCreateDate(LocalDateTime.now());
         }