fix: naming inconsistant
This commit is contained in:
parent
da47f8d80e
commit
236e6a24ed
1 changed files with 10 additions and 6 deletions
|
|
@ -127,7 +127,7 @@ export class TaskController extends Controller {
|
||||||
institutionId: string;
|
institutionId: string;
|
||||||
registeredBranchId?: string;
|
registeredBranchId?: string;
|
||||||
|
|
||||||
requestWork: { requestWorkId: string; step: number }[];
|
taskList: { requestWorkId: string; step: number }[];
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
return await prisma.$transaction(async (tx) => {
|
return await prisma.$transaction(async (tx) => {
|
||||||
|
|
@ -149,7 +149,7 @@ export class TaskController extends Controller {
|
||||||
|
|
||||||
const code = `PO${year}${month}${last.value.toString().padStart(6, "0")}`;
|
const code = `PO${year}${month}${last.value.toString().padStart(6, "0")}`;
|
||||||
|
|
||||||
const { requestWork, ...rest } = body;
|
const { taskList, ...rest } = body;
|
||||||
|
|
||||||
const userAffiliatedBranch = await tx.branch.findFirst({
|
const userAffiliatedBranch = await tx.branch.findFirst({
|
||||||
include: branchRelationPermInclude(req.user),
|
include: branchRelationPermInclude(req.user),
|
||||||
|
|
@ -184,7 +184,7 @@ export class TaskController extends Controller {
|
||||||
registeredBranchId: userAffiliatedBranch.id,
|
registeredBranchId: userAffiliatedBranch.id,
|
||||||
createdByUserId: req.user.sub,
|
createdByUserId: req.user.sub,
|
||||||
taskList: {
|
taskList: {
|
||||||
connect: requestWork.map((v) => ({ step_requestWorkId: v })),
|
connect: taskList.map((v) => ({ step_requestWorkId: v })),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
@ -205,7 +205,7 @@ export class TaskController extends Controller {
|
||||||
|
|
||||||
institutionId: string;
|
institutionId: string;
|
||||||
|
|
||||||
requestWork: { requestWorkId: string; step: number }[];
|
taskList: { requestWorkId: string; step: number }[];
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
const record = await prisma.taskOrder.findFirst({
|
const record = await prisma.taskOrder.findFirst({
|
||||||
|
|
@ -242,7 +242,7 @@ export class TaskController extends Controller {
|
||||||
disconnect: record?.taskList
|
disconnect: record?.taskList
|
||||||
.filter(
|
.filter(
|
||||||
(lhs) =>
|
(lhs) =>
|
||||||
!body.requestWork.find(
|
!body.taskList.find(
|
||||||
(rhs) => lhs.requestWorkId === rhs.requestWorkId && lhs.step === rhs.step,
|
(rhs) => lhs.requestWorkId === rhs.requestWorkId && lhs.step === rhs.step,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
@ -252,7 +252,7 @@ export class TaskController extends Controller {
|
||||||
step: v.step,
|
step: v.step,
|
||||||
},
|
},
|
||||||
})),
|
})),
|
||||||
connect: body.requestWork.map((v) => ({ step_requestWorkId: v })),
|
connect: body.taskList.map((v) => ({ step_requestWorkId: v })),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
@ -322,3 +322,7 @@ export class TaskActionController extends Controller {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Route("api/v1/task-order/{taskId}")
|
||||||
|
@Tags("Task Order")
|
||||||
|
export class TaskOrderAttachmentController extends Controller {}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue