diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts index 950b762..83ed235 100644 --- a/src/controllers/06-request-list-controller.ts +++ b/src/controllers/06-request-list-controller.ts @@ -183,9 +183,24 @@ export class RequestListController extends Controller { @Query() pageSize: number = 30, @Query() requestDataId?: string, @Query() workStatus?: RequestWorkStatus, + @Query() readyToTask?: boolean, ) { + let statusCondition: Prisma.RequestWorkWhereInput["stepStatus"] = {}; + + if (readyToTask) { + statusCondition = { + some: { + OR: [{ workStatus: RequestWorkStatus.Ready }, { workStatus: RequestWorkStatus.Redo }], + }, + }; + } else { + statusCondition = { + some: { workStatus }, + }; + } + const where = { - stepStatus: workStatus ? { some: { workStatus } } : undefined, + stepStatus: workStatus ? statusCondition : undefined, request: { id: requestDataId, quotation: {