diff --git a/src/controllers/04-flow-template-controller.ts b/src/controllers/04-flow-template-controller.ts index 2941402..78fbac7 100644 --- a/src/controllers/04-flow-template-controller.ts +++ b/src/controllers/04-flow-template-controller.ts @@ -14,7 +14,7 @@ import { } from "tsoa"; import { RequestWithUser } from "../interfaces/user"; import prisma from "../db"; -import { Prisma } from "@prisma/client"; +import { Prisma, Status } from "@prisma/client"; import { branchRelationPermInclude, createPermCheck, @@ -33,6 +33,7 @@ type WorkflowPayload = { responsiblePersonId?: string[]; }[]; registeredBranchId?: string; + status?: Status; }; const permissionCondCompany = createPermCondition((_) => true); @@ -75,7 +76,7 @@ export class FlowTemplateController extends Controller { }, }, }, - orderBy: { createdAt: "asc" }, + orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }], take: pageSize, skip: (page - 1) * pageSize, }), @@ -170,6 +171,7 @@ export class FlowTemplateController extends Controller { where: { id: templateId }, data: { ...body, + statusOrder: +(body.status === "INACTIVE"), step: { create: body.step.map((v, i) => ({ type: v.type,