diff --git a/prisma/schema.prisma b/prisma/schema.prisma index a44188d..7a48b16 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -482,6 +482,8 @@ model User { notificationRead Notification[] taskOrderCreated TaskOrder[] @relation("TaskOrderCreatedByUser") taskOrderAccepted TaskOrder[] + + requestWorkStepStatus RequestWorkStepStatus[] } model UserResponsibleArea { @@ -1452,6 +1454,16 @@ model RequestWorkStepStatus { attributes Json? + customerDuty Boolean? + customerDutyCost Float? + companyDuty Boolean? + companyDutyCost Float? + individualDuty Boolean? + individualDutyCost Float? + + responsibleUserId String? + responsibleUser User? @relation(fields: [responsibleUserId], references: [id]) + taskOrder TaskOrder? @relation(fields: [taskOrderId], references: [id]) taskOrderId String? diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts index 86bdfb9..6aac9dc 100644 --- a/src/controllers/06-request-list-controller.ts +++ b/src/controllers/06-request-list-controller.ts @@ -299,7 +299,18 @@ export class RequestListController extends Controller { async updateRequestWorkStepStatus( @Path() requestWorkId: string, @Path() step: number, - @Body() payload: { requestWorkStatus?: RequestWorkStatus; attributes?: Record }, + @Body() + payload: { + requestWorkStatus?: RequestWorkStatus; + attributes?: Record; + customerDuty?: boolean; + customerDutyCost?: number; + companyDuty?: boolean; + companyDutyCost?: number; + individualDuty?: boolean; + individualDutyCost?: number; + responsibleUserId?: string; + }, @Query() successAll?: boolean, ) { const record = await prisma.requestWorkStepStatus.upsert({ @@ -313,15 +324,11 @@ export class RequestListController extends Controller { }, }, create: { + ...payload, step: step, requestWorkId, - workStatus: payload.requestWorkStatus, - attributes: payload.attributes, - }, - update: { - workStatus: payload.requestWorkStatus, - attributes: payload.attributes, }, + update: payload, }); switch (payload.requestWorkStatus) {