xiongchao vor 3 Jahren
Ursprung
Commit
e28be55628

+ 5 - 2
platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -766,11 +766,14 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     public void finishJob(CheckJobDTO dto) {
         LocalDateTime now = LocalDateTime.now();
         CheckJob checkJob = mapper.selectByPrimaryKey(dto.getId());
-        if(!CheckJobStatusEnum.EXECUTING.getValue().equals(checkJob.getStatus()) && !CheckJobStatusEnum.OUT_OF_DATE.getValue().equals(checkJob.getStatus())){
+        /*if(!CheckJobStatusEnum.EXECUTING.getValue().equals(checkJob.getStatus()) && !CheckJobStatusEnum.OUT_OF_DATE.getValue().equals(checkJob.getStatus())){
             return;
-        }
+        }*/
         checkJob.setStatus(CheckJobStatusEnum.FINISHED.getValue());
         checkJob.setActualEndTime(now);
+        if(checkJob.getActualStartTime() == null){
+            checkJob.setActualStartTime(dto.getActualStartTime());
+        }
         checkJob.setRealHours(DateUtils.getDurationMinutes(checkJob.getActualStartTime(), checkJob.getActualEndTime()) + "");
         OauthUser oauthUser = SecurityUtils.checkAndGetUser();
         if(oauthUser==null){// 未登录,在获取设备的使用人员