refactor: map current task status to user task status instead
This commit is contained in:
parent
c8f7059df7
commit
6296088935
1 changed files with 13 additions and 1 deletions
|
|
@ -545,6 +545,7 @@ export class UserTaskController extends Controller {
|
||||||
prisma.taskOrder.findMany({
|
prisma.taskOrder.findMany({
|
||||||
where,
|
where,
|
||||||
include: {
|
include: {
|
||||||
|
userTask: true,
|
||||||
institution: true,
|
institution: true,
|
||||||
createdBy: true,
|
createdBy: true,
|
||||||
},
|
},
|
||||||
|
|
@ -552,6 +553,17 @@ export class UserTaskController extends Controller {
|
||||||
prisma.taskOrder.count({ where }),
|
prisma.taskOrder.count({ where }),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return { result, page, pageSize, total };
|
return {
|
||||||
|
result: result.map((lhs) => ({
|
||||||
|
...lhs,
|
||||||
|
taskOrderStatus:
|
||||||
|
lhs.userTask.find((rhs) => rhs.taskOrderId === lhs.id)?.userTaskStatus ??
|
||||||
|
lhs.taskOrderStatus,
|
||||||
|
userTask: undefined,
|
||||||
|
})),
|
||||||
|
page,
|
||||||
|
pageSize,
|
||||||
|
total,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue