feat: order by status field
This commit is contained in:
parent
0bd2c1ecf2
commit
09cf32d3c7
8 changed files with 14 additions and 8 deletions
|
|
@ -152,7 +152,7 @@ export class CustomerBranchController extends Controller {
|
||||||
|
|
||||||
const [result, total] = await prisma.$transaction([
|
const [result, total] = await prisma.$transaction([
|
||||||
prisma.customerBranch.findMany({
|
prisma.customerBranch.findMany({
|
||||||
orderBy: { createdAt: "asc" },
|
orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }],
|
||||||
include: {
|
include: {
|
||||||
customer: includeCustomer,
|
customer: includeCustomer,
|
||||||
province: true,
|
province: true,
|
||||||
|
|
|
||||||
|
|
@ -175,7 +175,7 @@ export class CustomerController extends Controller {
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
},
|
},
|
||||||
orderBy: { createdAt: "asc" },
|
orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }],
|
||||||
where,
|
where,
|
||||||
take: pageSize,
|
take: pageSize,
|
||||||
skip: (page - 1) * pageSize,
|
skip: (page - 1) * pageSize,
|
||||||
|
|
|
||||||
|
|
@ -253,7 +253,7 @@ export class EmployeeController extends Controller {
|
||||||
|
|
||||||
const [result, total] = await prisma.$transaction([
|
const [result, total] = await prisma.$transaction([
|
||||||
prisma.employee.findMany({
|
prisma.employee.findMany({
|
||||||
orderBy: { createdAt: "asc" },
|
orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }],
|
||||||
include: {
|
include: {
|
||||||
province: true,
|
province: true,
|
||||||
district: true,
|
district: true,
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,10 @@ export class ProductGroup extends Controller {
|
||||||
{ detail: { contains: query }, ...filterStatus(status) },
|
{ detail: { contains: query }, ...filterStatus(status) },
|
||||||
],
|
],
|
||||||
} satisfies Prisma.ProductGroupWhereInput;
|
} satisfies Prisma.ProductGroupWhereInput;
|
||||||
return prisma.productGroup.findMany({ orderBy: { createdAt: "asc" }, where });
|
return prisma.productGroup.findMany({
|
||||||
|
orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }],
|
||||||
|
where,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("{groupId}")
|
@Get("{groupId}")
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ export class ProductController extends Controller {
|
||||||
|
|
||||||
const [result, total] = await prisma.$transaction([
|
const [result, total] = await prisma.$transaction([
|
||||||
prisma.product.findMany({
|
prisma.product.findMany({
|
||||||
orderBy: { createdAt: "asc" },
|
orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }],
|
||||||
where,
|
where,
|
||||||
take: pageSize,
|
take: pageSize,
|
||||||
skip: (page - 1) * pageSize,
|
skip: (page - 1) * pageSize,
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,10 @@ export class ProductType extends Controller {
|
||||||
{ detail: { contains: query }, ...filterStatus(status) },
|
{ detail: { contains: query }, ...filterStatus(status) },
|
||||||
],
|
],
|
||||||
} satisfies Prisma.ProductTypeWhereInput;
|
} satisfies Prisma.ProductTypeWhereInput;
|
||||||
const result = prisma.productType.findMany({ orderBy: { createdAt: "asc" }, where });
|
const result = prisma.productType.findMany({
|
||||||
|
orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }],
|
||||||
|
where,
|
||||||
|
});
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ export class ServiceController extends Controller {
|
||||||
include: {
|
include: {
|
||||||
work: true,
|
work: true,
|
||||||
},
|
},
|
||||||
orderBy: { createdAt: "asc" },
|
orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }],
|
||||||
where,
|
where,
|
||||||
take: pageSize,
|
take: pageSize,
|
||||||
skip: (page - 1) * pageSize,
|
skip: (page - 1) * pageSize,
|
||||||
|
|
|
||||||
|
|
@ -166,7 +166,7 @@ export class UserController extends Controller {
|
||||||
|
|
||||||
const [result, total] = await prisma.$transaction([
|
const [result, total] = await prisma.$transaction([
|
||||||
prisma.user.findMany({
|
prisma.user.findMany({
|
||||||
orderBy: { createdAt: "asc" },
|
orderBy: [{ statusOrder: "asc" }, { createdAt: "asc" }],
|
||||||
include: {
|
include: {
|
||||||
province: true,
|
province: true,
|
||||||
district: true,
|
district: true,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue