|
|
@ -60,11 +60,14 @@ public class CheckServiceImpl implements CheckService { |
|
|
|
UpdateWrapper<Task> taskUpdateWrapper = new UpdateWrapper<>(); |
|
|
|
taskUpdateWrapper.eq("id",taskId); |
|
|
|
Task task = new Task(); |
|
|
|
task.setEndTime(null); |
|
|
|
task.setStartTime(null); |
|
|
|
if (currentCoord != null){ |
|
|
|
task.setCurrentCoord(currentCoord); |
|
|
|
} |
|
|
|
if (updateStartTime) { |
|
|
|
task.setStartTime(new Date()); |
|
|
|
task.setEndTime(null); |
|
|
|
} |
|
|
|
if (updateEndTime) { |
|
|
|
task.setEndTime(new Date()); |
|
|
@ -179,20 +182,23 @@ public class CheckServiceImpl implements CheckService { |
|
|
|
this.changeBreakOff(false); |
|
|
|
this.updateCoordAndStatus(taskId, null, 1, false, false); |
|
|
|
currentTaskId = taskId; |
|
|
|
String nextCoord = ""; |
|
|
|
if (order == 0) { |
|
|
|
if (startIndex == null || "".equals(startIndex)) { |
|
|
|
this.initCheck("1-6", order, taskId); |
|
|
|
nextCoord = this.initCheck("1-6", order, taskId); |
|
|
|
}else { |
|
|
|
this.continueCheck(taskId, order); |
|
|
|
nextCoord = this.continueCheck(taskId, order); |
|
|
|
} |
|
|
|
}else if (order == 1) { |
|
|
|
if (startIndex == null || "".equals(startIndex)) { |
|
|
|
this.initCheck("6-1", order, taskId); |
|
|
|
nextCoord = this.initCheck("6-1", order, taskId); |
|
|
|
}else { |
|
|
|
this.continueCheck(taskId, order); |
|
|
|
nextCoord = this.continueCheck(taskId, order); |
|
|
|
} |
|
|
|
} |
|
|
|
return null; |
|
|
|
CheckResult checkResult = new CheckResult(); |
|
|
|
checkResult.setCurrentTestCoord(nextCoord); |
|
|
|
return checkResult; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|