|
@@ -480,7 +480,10 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
|
|
|
if (Objects.equals(jobUser.getJobStatus(), JobStatusEnum.NOT_STARTED.status)) {
|
|
if (Objects.equals(jobUser.getJobStatus(), JobStatusEnum.NOT_STARTED.status)) {
|
|
|
jobUser.setJobStatus(JobStatusEnum.READY_TO_UNLOCK.status);
|
|
jobUser.setJobStatus(JobStatusEnum.READY_TO_UNLOCK.status);
|
|
|
} else if (Objects.equals(jobUser.getJobStatus(), JobStatusEnum.READY_TO_UNLOCK.status)) {
|
|
} else if (Objects.equals(jobUser.getJobStatus(), JobStatusEnum.READY_TO_UNLOCK.status)) {
|
|
|
- jobUser.setJobStatus(JobStatusEnum.UNLOCKED.status);
|
|
|
|
|
|
|
+ jobUserList.stream()
|
|
|
|
|
+ .filter(data -> Objects.equals(data.getUserId(), userId) && Objects.equals(data.getUserRole(), JTCOLOCKER.key))
|
|
|
|
|
+ .findFirst()
|
|
|
|
|
+ .ifPresent(data -> data.setJobStatus(JobStatusEnum.UNLOCKED.status));
|
|
|
checkJobStatus(isJobTicket, jobUserList);
|
|
checkJobStatus(isJobTicket, jobUserList);
|
|
|
} else if (Objects.equals(jobUser.getJobStatus(), JobStatusEnum.UNLOCKED.status)) {
|
|
} else if (Objects.equals(jobUser.getJobStatus(), JobStatusEnum.UNLOCKED.status)) {
|
|
|
// 作业票本人Job部分已完成
|
|
// 作业票本人Job部分已完成
|