签名

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

@@ -338,31 +338,23 @@ public class WorkerServiceImpl implements WorkerService {
     @Override
     public Boolean finishCycle(Long userId, String userName, UpSignParam upSignParam) {
         Truck truck = truckService.getById(upSignParam.getTruckId());
-        //如果是收车中，上传签名，结束本次行车周期
         if (truck != null) {
-            if (truck.getTmsStatus() == TmsTruckStatus.RETURNING) {
-                WorkCycle workCycle = workCycleService.findCurrentWorkCycle(upSignParam.getTruckId());
-                if (workCycle != null) {
-                    workCycle.setDriverOneSignUrl(upSignParam.getDriverOneSignUrl());
-                    workCycle.setDriverTwoSignUrl(upSignParam.getDriverTwoSignUrl());
-                    workCycle.setEscortSignUrl(upSignParam.getEscortSignUrl());
-                    workCycle.setStatus(2);
-                    workCycle.setEndTime(LocalDateTime.now());
-                    workCycle.setUpdater(userId);
-                    workCycle.setUpdaterName(userName);
-                    workCycle.setUpdateDate(LocalDateTime.now());
-                    workCycleService.updateById(workCycle);
-
-                    //已收车
-                    truck.setTmsStatus(TmsTruckStatus.DONE);
-                    truckService.updateById(truck);
-                } else {
-                    truck.setTmsStatus(TmsTruckStatus.PRE_CHECK);
-                    truckService.updateById(truck);
-                }
-            }
-
+            WorkCycle workCycle = workCycleService.findCurrentWorkCycle(upSignParam.getTruckId());
+            if (workCycle != null) {
+                workCycle.setDriverOneSignUrl(upSignParam.getDriverOneSignUrl());
+                workCycle.setDriverTwoSignUrl(upSignParam.getDriverTwoSignUrl());
+                workCycle.setEscortSignUrl(upSignParam.getEscortSignUrl());
+                workCycle.setStatus(2);
+                workCycle.setEndTime(LocalDateTime.now());
+                workCycle.setUpdater(userId);
+                workCycle.setUpdaterName(userName);
+                workCycle.setUpdateDate(LocalDateTime.now());
+                workCycleService.updateById(workCycle);
 
+                //已收车
+                truck.setTmsStatus(TmsTruckStatus.DONE);
+                truckService.updateById(truck);
+            }
         }
         return null;
     }