chamomind/jws-backend
chamomind/jws-backend
6
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

Pull data with CustomerBranch
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 7s
Details

Browse source
This commit is contained in:
Kanjana 2025-04-11 12:06:11 +07:00
parent a06d5514fc
commit 62def572de
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/06-request-list-controller.ts
View file

@ -187,6 +187,8 @@ export class RequestDataController extends Controller {
employeePassport: { employeePassport: {
orderBy: { expireDate: "desc" }, orderBy: { expireDate: "desc" },
}, },
customerBranch: {
include: {
province: { province: {
include: { include: {
employmentOffice: true, employmentOffice: true,
@ -200,6 +202,8 @@ export class RequestDataController extends Controller {
}, },
}, },
}, },
},
},
take: pageSize, take: pageSize,
skip: (page - 1) * pageSize, skip: (page - 1) * pageSize,
orderBy: [{ quotation: { urgent: "desc" } }, { createdAt: "desc" }], orderBy: [{ quotation: { urgent: "desc" } }, { createdAt: "desc" }],
@ -210,9 +214,8 @@ export class RequestDataController extends Controller {
const dataRequestData = result.map((item) => { const dataRequestData = result.map((item) => {
const employee = item.employee; const employee = item.employee;
const dataOffice = const dataOffice =
item.employee.provinceId === "10" employee.customerBranch.district?.employmentOffice.at(0) ??
? employee.district?.employmentOffice employee.customerBranch.province?.employmentOffice.at(0);
: employee.province?.employmentOffice;
return { return {
...item, ...item,