diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts index a316fd6..a3f5124 100644 --- a/src/controllers/06-request-list-controller.ts +++ b/src/controllers/06-request-list-controller.ts @@ -305,6 +305,7 @@ export class RequestListController extends Controller { OR: [ { workStatus: RequestWorkStatus.Ready }, { + workStatus: { in: [RequestWorkStatus.Ready, RequestWorkStatus.InProgress] }, task: { some: { taskStatus: TaskStatus.Redo, diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts index a79df58..a52e4a9 100644 --- a/src/controllers/07-task-controller.ts +++ b/src/controllers/07-task-controller.ts @@ -421,6 +421,14 @@ export class TaskController extends Controller { ), ); + await tx.requestWorkStepStatus.updateMany({ + where: { + OR: body.taskList, + workStatus: RequestWorkStatus.Ready, + }, + data: { workStatus: RequestWorkStatus.InProgress }, + }); + return await tx.taskOrder.update({ where: { id: taskOrderId }, include: {