hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
mamoss 2025-11-29 15:36:34 +07:00
commit 10dc1670b8
9 changed files with 231 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/controllers/CommandController.ts
View file

@ -215,7 +215,7 @@ export class CommandController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: _data.child1, child1: _data.child1,
@ -1477,7 +1477,7 @@ export class CommandController extends Controller {
} }
// @Get("XXX") // @Get("XXX")
async cronjobUpdateRetirementStatus(/*@Request() request: RequestWithUser*/) { async cronjobUpdateRetirementStatus(/*@Request() request: RequestWithUser*/) {
const adminToken = await getToken() ?? ""; const adminToken = (await getToken()) ?? "";
const today = new Date(); const today = new Date();
today.setUTCHours(0, 0, 0, 0); today.setUTCHours(0, 0, 0, 0);
let type: string = "OFFICER"; let type: string = "OFFICER";
@ -1672,7 +1672,7 @@ export class CommandController extends Controller {
positionIsSelected: false, positionIsSelected: false,
lastUpdateFullName: "System Administrator", lastUpdateFullName: "System Administrator",
lastUpdatedAt: _Date, lastUpdatedAt: _Date,
} },
); );
_posMaster.isSit = false; _posMaster.isSit = false;
_posMaster.current_holderId = null; _posMaster.current_holderId = null;
@ -1702,7 +1702,7 @@ export class CommandController extends Controller {
positionIsSelected: false, positionIsSelected: false,
lastUpdateFullName: "System Administrator", lastUpdateFullName: "System Administrator",
lastUpdatedAt: _Date, lastUpdatedAt: _Date,
} },
); );
_posMaster.isSit = false; _posMaster.isSit = false;
_posMaster.next_holderId = null; _posMaster.next_holderId = null;
@ -1730,7 +1730,7 @@ export class CommandController extends Controller {
positionIsSelected: false, positionIsSelected: false,
lastUpdateFullName: "System Administrator", lastUpdateFullName: "System Administrator",
lastUpdatedAt: _Date, lastUpdatedAt: _Date,
} },
); );
_posMaster.isSit = false; _posMaster.isSit = false;
_posMaster.current_holderId = null; _posMaster.current_holderId = null;
@ -1977,35 +1977,38 @@ export class CommandController extends Controller {
if (commandCode == "C-PM-21") { if (commandCode == "C-PM-21") {
profileTemp.position = profile?.positionTemp ?? "-"; profileTemp.position = profile?.positionTemp ?? "-";
profileTemp.posLevel = profile?.posLevelNameTemp ?? "-"; profileTemp.posLevel = profile?.posLevelNameTemp ?? "-";
profileTemp.org = (profile?.child4Temp == null ? "" : profile?.child4Temp + "\n") + profileTemp.org =
(profile?.child4Temp == null ? "" : profile?.child4Temp + "\n") +
(profile?.child3Temp == null ? "" : profile?.child3Temp + "\n") + (profile?.child3Temp == null ? "" : profile?.child3Temp + "\n") +
(profile?.child2Temp == null ? "" : profile?.child2Temp + "\n") + (profile?.child2Temp == null ? "" : profile?.child2Temp + "\n") +
(profile?.child1Temp == null ? "" : profile?.child1Temp + "\n") + (profile?.child1Temp == null ? "" : profile?.child1Temp + "\n") +
(profile?.rootTemp == null ? "" : profile?.rootTemp) (profile?.rootTemp == null ? "" : profile?.rootTemp);
if (profile?.nodeTemp) { if (profile?.nodeTemp) {
switch (profile?.nodeTemp) { switch (profile?.nodeTemp) {
case "4": case "4":
profileTemp.posNo = `${profile.child4ShortNameTemp} ${profile?.posMasterNoTemp}`; profileTemp.posNo = `${profile.child4ShortNameTemp} ${profile?.posMasterNoTemp}`;
break break;
case "3": case "3":
profileTemp.posNo = `${profile.child3ShortNameTemp} ${profile?.posMasterNoTemp}`; profileTemp.posNo = `${profile.child3ShortNameTemp} ${profile?.posMasterNoTemp}`;
break break;
case "2": case "2":
profileTemp.posNo = `${profile.child2ShortNameTemp} ${profile?.posMasterNoTemp}`; profileTemp.posNo = `${profile.child2ShortNameTemp} ${profile?.posMasterNoTemp}`;
break break;
case "1": case "1":
profileTemp.posNo = `${profile.child1ShortNameTemp} ${profile?.posMasterNoTemp}`; profileTemp.posNo = `${profile.child1ShortNameTemp} ${profile?.posMasterNoTemp}`;
break break;
case "0": case "0":
profileTemp.posNo = `${profile.rootShortNameTemp} ${profile?.posMasterNoTemp}`; profileTemp.posNo = `${profile.rootShortNameTemp} ${profile?.posMasterNoTemp}`;
break break;
default: break; default:
break;
} }
} }
} }
return { return {
no: Extension.ToThaiNumber((idx + 1).toString()), no: Extension.ToThaiNumber((idx + 1).toString()),
org: commandCode != "C-PM-21" org:
commandCode != "C-PM-21"
? profile?.isLeave == false ? profile?.isLeave == false
? (_child4 == null ? "" : _child4 + "\n") + ? (_child4 == null ? "" : _child4 + "\n") +
(_child3 == null ? "" : _child3 + "\n") + (_child3 == null ? "" : _child3 + "\n") +
@ -2016,19 +2019,22 @@ export class CommandController extends Controller {
: profileTemp.org, : profileTemp.org,
fullName: `${x.prefix}${x.firstName} ${x.lastName}`, fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
citizenId: Extension.ToThaiNumber(x.citizenId), citizenId: Extension.ToThaiNumber(x.citizenId),
position: commandCode != "C-PM-21" position:
commandCode != "C-PM-21"
? profile?.position ? profile?.position
? profile?.position ? profile?.position
: "-" : "-"
: profileTemp.position, : profileTemp.position,
posLevel: commandCode != "C-PM-21" posLevel:
commandCode != "C-PM-21"
? profile?.posType && profile?.posLevel ? profile?.posType && profile?.posLevel
? Extension.ToThaiNumber( ? Extension.ToThaiNumber(
`${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`, `${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`,
) )
: "-" : "-"
: Extension.ToThaiNumber(profileTemp.posLevel), : Extension.ToThaiNumber(profileTemp.posLevel),
posNo: commandCode != "C-PM-21" posNo:
commandCode != "C-PM-21"
? shortName ? shortName
? Extension.ToThaiNumber(shortName) ? Extension.ToThaiNumber(shortName)
: "-" : "-"
@ -4277,12 +4283,11 @@ export class CommandController extends Controller {
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
}
}, },
relations:['orgRevision'] },
relations: ["orgRevision"],
}); });
const orgRevisionRef = posMaster ? posMaster.id : null; const orgRevisionRef = posMaster ? posMaster.id : null;
//ลบตำแหน่งที่รักษาการแทน //ลบตำแหน่งที่รักษาการแทน

17
src/controllers/DevelopmentRequestController.ts
View file

@ -104,13 +104,10 @@ export class DevelopmentRequestController extends Controller {
); );
}), }),
) )
.orderBy("developmentRequest.createdAt", "DESC") .orderBy("developmentRequest.createdAt", "DESC");
if (sortBy) { if (sortBy) {
query = query.orderBy( query = query.orderBy(`developmentRequest.${sortBy}`, descending ? "DESC" : "ASC");
`developmentRequest.${sortBy}`,
descending ? "DESC" : "ASC"
);
} }
const [lists, total] = await query const [lists, total] = await query
@ -166,7 +163,7 @@ export class DevelopmentRequestController extends Controller {
data.child1 != undefined && data.child1 != null data.child1 != undefined && data.child1 != null
? data.child1[0] != null ? data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: data.child1, child1: data.child1,
@ -250,14 +247,10 @@ export class DevelopmentRequestController extends Controller {
); );
}), }),
) )
.orderBy("developmentRequest.createdAt", "DESC") .orderBy("developmentRequest.createdAt", "DESC");
if (sortBy) { if (sortBy) {
query = query.orderBy( query = query.orderBy(`developmentRequest.${sortBy}`, descending ? "DESC" : "ASC");
`developmentRequest.${sortBy}`,
descending ? "DESC" : "ASC"
);
} }
const [lists, total] = await query const [lists, total] = await query

10
src/controllers/OrganizationDotnetController.ts
View file

@ -1211,6 +1211,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1234,6 +1235,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1256,6 +1258,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1278,6 +1281,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1300,6 +1304,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1511,6 +1516,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1534,6 +1540,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1556,6 +1563,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1578,6 +1586,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,
@ -1600,6 +1609,7 @@ export class OrganizationDotnetController extends Controller {
let pos = await this.posMasterRepository.findOne({ let pos = await this.posMasterRepository.findOne({
relations: ["current_holder"], relations: ["current_holder"],
where: { where: {
current_holder: Not(IsNull()),
orgRevision: { orgRevision: {
orgRevisionIsCurrent: true, orgRevisionIsCurrent: true,
orgRevisionIsDraft: false, orgRevisionIsDraft: false,

49
src/controllers/ProfileController.ts
View file

@ -2219,7 +2219,7 @@ export class ProfileController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: _data.child1, child1: _data.child1,
@ -6137,7 +6137,7 @@ export class ProfileController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ child1: _data.child1 }, { child1: _data.child1 },
) )
@ -6524,7 +6524,7 @@ export class ProfileController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ child1: _data.child1 }, { child1: _data.child1 },
) )
@ -6632,6 +6632,7 @@ export class ProfileController extends Controller {
position: _data.position, position: _data.position,
posNo: shortName ?? null, posNo: shortName ?? null,
rootId: holder?.orgRoot?.id ?? null, rootId: holder?.orgRoot?.id ?? null,
child1Id: holder?.orgChild1Id ?? null,
root: holder?.orgRoot?.orgRootName ?? null, root: holder?.orgRoot?.orgRootName ?? null,
rootDnaId: holder?.orgRoot == null ? null : holder?.orgRoot?.ancestorDNA, rootDnaId: holder?.orgRoot == null ? null : holder?.orgRoot?.ancestorDNA,
orgRootShortName: holder?.orgRoot?.orgRootShortName ?? null, orgRootShortName: holder?.orgRoot?.orgRootShortName ?? null,
@ -7352,7 +7353,7 @@ export class ProfileController extends Controller {
nodeDnaId: null, nodeDnaId: null,
type: profile.employeeClass, type: profile.employeeClass,
salary: profile.amount, salary: profile.amount,
posNo: null posNo: null,
// root?.orgRootShortName && posMaster?.posMasterNo // root?.orgRootShortName && posMaster?.posMasterNo
// ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}` // ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
// : "", // : "",
@ -7521,7 +7522,7 @@ export class ProfileController extends Controller {
nodeDnaId: null, nodeDnaId: null,
salary: profile ? profile.amount : null, salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null, amountSpecial: profile ? profile.amountSpecial : null,
posNo: null posNo: null,
// root?.orgRootShortName && posMaster?.posMasterNo // root?.orgRootShortName && posMaster?.posMasterNo
// ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}` // ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
// : "", // : "",
@ -8867,7 +8868,7 @@ export class ProfileController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ child1: _data.child1 }, { child1: _data.child1 },
) )
@ -9390,7 +9391,7 @@ export class ProfileController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: _data.child1, child1: _data.child1,
@ -9781,15 +9782,20 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("current_holders.positions", "positions") .leftJoinAndSelect("current_holders.positions", "positions")
.leftJoinAndSelect("positions.posExecutive", "posExecutive") .leftJoinAndSelect("positions.posExecutive", "posExecutive")
.andWhere( .andWhere(
new Brackets(qb => { new Brackets((qb) => {
qb.where("profile.position LIKE :keyword", { keyword: `%${body.keyword}%` }) qb.where("profile.position LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("posLevel.posLevelName LIKE :keyword", { keyword: `%${body.keyword}%` }) .orWhere("posLevel.posLevelName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("posType.posTypeName LIKE :keyword", { keyword: `%${body.keyword}%` }) .orWhere("posType.posTypeName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword", { keyword: `%${body.keyword}%` }); .orWhere(
}) "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword",
{ keyword: `%${body.keyword}%` },
);
}),
) )
.andWhere("profile.isLeave = false") .andWhere("profile.isLeave = false")
.andWhere("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: orgRevisionActive.id }); .andWhere("current_holders.orgRevisionId = :orgRevisionId", {
orgRevisionId: orgRevisionActive.id,
});
const [findProfile, total] = await query const [findProfile, total] = await query
.orderBy("profile.citizenId", "ASC") .orderBy("profile.citizenId", "ASC")
@ -9807,9 +9813,10 @@ export class ProfileController extends Controller {
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id); : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id);
const position = const position =
posMaster == null || posMaster == null ||
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions == null || item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions ==
item.current_holders?.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions.length == null ||
0 || item.current_holders?.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions
.length == 0 ||
item.current_holders item.current_holders
.find((x) => x.orgRevisionId == orgRevisionActive.id) .find((x) => x.orgRevisionId == orgRevisionActive.id)
?.positions?.find((position) => position.positionIsSelected == true) == null ?.positions?.find((position) => position.positionIsSelected == true) == null
@ -9837,18 +9844,20 @@ export class ProfileController extends Controller {
item.current_holders.length == 0 item.current_holders.length == 0
? null ? null
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null && : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null &&
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild4 != item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
null ?.orgChild4 != null
? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}` ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null && : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null &&
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild3 != item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
null ?.orgChild3 != null
? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}` ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null && : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) !=
null &&
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
?.orgChild2 != null ?.orgChild2 != null
? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}` ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null && : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) !=
null &&
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
?.orgChild1 != null ?.orgChild1 != null
? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}` ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`

21
src/controllers/ProfileEditController.ts
View file

@ -75,13 +75,10 @@ export class ProfileEditController extends Controller {
); );
}), }),
) )
.orderBy("ProfileEdit.createdAt", "DESC") .orderBy("ProfileEdit.createdAt", "DESC");
if (sortBy) { if (sortBy) {
query = query.orderBy( query = query.orderBy(`ProfileEdit.${sortBy}`, descending ? "DESC" : "ASC");
`ProfileEdit.${sortBy}`,
descending ? "DESC" : "ASC"
);
} }
const [getProfileEdit, total] = await query const [getProfileEdit, total] = await query
@ -153,7 +150,7 @@ export class ProfileEditController extends Controller {
data.child1 != undefined && data.child1 != null data.child1 != undefined && data.child1 != null
? data.child1[0] != null ? data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: data.child1, child1: data.child1,
@ -216,19 +213,13 @@ export class ProfileEditController extends Controller {
); );
}), }),
) )
.orderBy("ProfileEdit.createdAt", "DESC") .orderBy("ProfileEdit.createdAt", "DESC");
if (sortBy) { if (sortBy) {
if (sortBy == "fullname") { if (sortBy == "fullname") {
query = query.orderBy( query = query.orderBy(`profile.firstName`, descending ? "DESC" : "ASC");
`profile.firstName`,
descending ? "DESC" : "ASC"
);
} else { } else {
query = query.orderBy( query = query.orderBy(`ProfileEdit.${sortBy}`, descending ? "DESC" : "ASC");
`ProfileEdit.${sortBy}`,
descending ? "DESC" : "ASC"
);
} }
} }

14
src/controllers/ProfileEditEmployeeController.ts
View file

@ -148,7 +148,7 @@ export class ProfileEditEmployeeController extends Controller {
data.child1 != undefined && data.child1 != null data.child1 != undefined && data.child1 != null
? data.child1[0] != null ? data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: data.child1, child1: data.child1,
@ -211,19 +211,13 @@ export class ProfileEditEmployeeController extends Controller {
); );
}), }),
) )
.orderBy("ProfileEdit.createdAt", "DESC") .orderBy("ProfileEdit.createdAt", "DESC");
if (sortBy) { if (sortBy) {
if (sortBy == "fullname") { if (sortBy == "fullname") {
query = query.orderBy( query = query.orderBy(`profileEmployee.firstName`, descending ? "DESC" : "ASC");
`profileEmployee.firstName`,
descending ? "DESC" : "ASC"
);
} else { } else {
query = query.orderBy( query = query.orderBy(`ProfileEdit.${sortBy}`, descending ? "DESC" : "ASC");
`ProfileEdit.${sortBy}`,
descending ? "DESC" : "ASC"
);
} }
} }

50
src/controllers/ProfileEmployeeController.ts
View file

@ -2039,7 +2039,10 @@ export class ProfileEmployeeController extends Controller {
await this.informationHistoryRepository.delete({ profileEmployeeId: id }); await this.informationHistoryRepository.delete({ profileEmployeeId: id });
await this.profileRepo.remove(result); await this.profileRepo.remove(result);
} catch { } catch {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่สามารถลบข้อมูลได้ เนื่องจากข้อมูลนี้ถูกใช้งานในระบบอื่น"); throw new HttpError(
HttpStatusCode.NOT_FOUND,
"ไม่สามารถลบข้อมูลได้ เนื่องจากข้อมูลนี้ถูกใช้งานในระบบอื่น",
);
} }
return new HttpSuccess(); return new HttpSuccess();
} }
@ -2837,7 +2840,7 @@ export class ProfileEmployeeController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: _data.child1, child1: _data.child1,
@ -3582,7 +3585,7 @@ export class ProfileEmployeeController extends Controller {
nodeDnaId: null, nodeDnaId: null,
salary: profile ? profile.amount : null, salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null, amountSpecial: profile ? profile.amountSpecial : null,
posNo: null posNo: null,
// root?.orgRootShortName && posMaster?.posMasterNo // root?.orgRootShortName && posMaster?.posMasterNo
// ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}` // ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
// : "", // : "",
@ -3716,7 +3719,7 @@ export class ProfileEmployeeController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ child1: _data.child1 }, { child1: _data.child1 },
) )
@ -4274,7 +4277,7 @@ export class ProfileEmployeeController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: _data.child1, child1: _data.child1,
@ -4435,22 +4438,26 @@ export class ProfileEmployeeController extends Controller {
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions") .leftJoinAndSelect("current_holders.positions", "positions")
.andWhere( .andWhere(
new Brackets(qb => { new Brackets((qb) => {
qb.where("profileEmployee.position LIKE :keyword", { keyword: `%${body.keyword}%` }) qb.where("profileEmployee.position LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("posLevel.posLevelName LIKE :keyword", { keyword: `%${body.keyword}%` }) .orWhere("posLevel.posLevelName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("posType.posTypeName LIKE :keyword", { keyword: `%${body.keyword}%` }) .orWhere("posType.posTypeName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("CONCAT(profileEmployee.prefix, profileEmployee.firstName, ' ', profileEmployee.lastName) LIKE :keyword", { keyword: `%${body.keyword}%` }); .orWhere(
}) "CONCAT(profileEmployee.prefix, profileEmployee.firstName, ' ', profileEmployee.lastName) LIKE :keyword",
{ keyword: `%${body.keyword}%` },
);
}),
) )
.andWhere("profileEmployee.isLeave = false") .andWhere("profileEmployee.isLeave = false")
.andWhere("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: orgRevisionActive.id }); .andWhere("current_holders.orgRevisionId = :orgRevisionId", {
orgRevisionId: orgRevisionActive.id,
});
if (body.type) { if (body.type) {
const typeUpper = body.type.trim().toUpperCase(); const typeUpper = body.type.trim().toUpperCase();
if (typeUpper === "EMPLOYEE") { if (typeUpper === "EMPLOYEE") {
query = query.andWhere("profileEmployee.employeeClass = 'PERM'"); query = query.andWhere("profileEmployee.employeeClass = 'PERM'");
} } else if (typeUpper === "TEMP") {
else if (typeUpper === "TEMP"){
query = query.andWhere("profileEmployee.employeeClass = 'TEMP'"); query = query.andWhere("profileEmployee.employeeClass = 'TEMP'");
} }
} }
@ -4471,9 +4478,10 @@ export class ProfileEmployeeController extends Controller {
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id); : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id);
const position = const position =
posMaster == null || posMaster == null ||
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions == null || item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions ==
item.current_holders?.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions.length == null ||
0 || item.current_holders?.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions
.length == 0 ||
item.current_holders item.current_holders
.find((x) => x.orgRevisionId == orgRevisionActive.id) .find((x) => x.orgRevisionId == orgRevisionActive.id)
?.positions?.find((position) => position.positionIsSelected == true) == null ?.positions?.find((position) => position.positionIsSelected == true) == null
@ -4486,18 +4494,20 @@ export class ProfileEmployeeController extends Controller {
item.current_holders.length == 0 item.current_holders.length == 0
? null ? null
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null && : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null &&
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild4 != item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
null ?.orgChild4 != null
? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}` ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null && : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null &&
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild3 != item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
null ?.orgChild3 != null
? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}` ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null && : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) !=
null &&
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
?.orgChild2 != null ?.orgChild2 != null
? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}` ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
: item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null && : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) !=
null &&
item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
?.orgChild1 != null ?.orgChild1 != null
? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}` ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`

58
src/controllers/ProfileSalaryTempController.ts
View file

@ -120,7 +120,7 @@ export class ProfileSalaryTempController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: _data.child1, child1: _data.child1,
@ -322,46 +322,36 @@ export class ProfileSalaryTempController extends Controller {
.andWhere("current_holders.orgRootId = :rootId", { .andWhere("current_holders.orgRootId = :rootId", {
rootId: rootId, rootId: rootId,
}) })
.addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order") .addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order");
// .orderBy(`${sortBy}`, sort) // .orderBy(`${sortBy}`, sort)
if (sortBy) { if (sortBy) {
if (sortBy == "posLevel") { if (sortBy == "posLevel") {
query = query.orderBy( query = query.orderBy(`posLevel.posLevelName`, descending ? "DESC" : "ASC");
`posLevel.posLevelName`,
descending ? "DESC" : "ASC"
);
} else if (sortBy == "posType") { } else if (sortBy == "posType") {
query = query.orderBy( query = query.orderBy(`posType.posTypeName`, descending ? "DESC" : "ASC");
`posType.posTypeName`,
descending ? "DESC" : "ASC"
);
} else if (sortBy == "posExecutive") { } else if (sortBy == "posExecutive") {
query = query.orderBy( query = query.orderBy(`posExecutive.posExecutiveName`, descending ? "DESC" : "ASC");
`posExecutive.posExecutiveName`,
descending ? "DESC" : "ASC"
);
} else if (sortBy == "posNo") { } else if (sortBy == "posNo") {
query = query.orderBy("orgChild4.orgChild4ShortName",descending ? "DESC" : "ASC") query = query
.orderBy("orgChild4.orgChild4ShortName", descending ? "DESC" : "ASC")
.addOrderBy("orgChild3.orgChild3ShortName", descending ? "DESC" : "ASC") .addOrderBy("orgChild3.orgChild3ShortName", descending ? "DESC" : "ASC")
.addOrderBy("orgChild2.orgChild2ShortName", descending ? "DESC" : "ASC") .addOrderBy("orgChild2.orgChild2ShortName", descending ? "DESC" : "ASC")
.addOrderBy("orgChild1.orgChild1ShortName", descending ? "DESC" : "ASC") .addOrderBy("orgChild1.orgChild1ShortName", descending ? "DESC" : "ASC")
.addOrderBy("orgRoot.orgRootShortName", descending ? "DESC" : "ASC") .addOrderBy("orgRoot.orgRootShortName", descending ? "DESC" : "ASC")
.addOrderBy("current_holders.posMasterNo",descending ? "DESC" : "ASC") .addOrderBy("current_holders.posMasterNo", descending ? "DESC" : "ASC");
} else { } else {
query = query.orderBy( query = query.orderBy(`profile.${sortBy}`, descending ? "DESC" : "ASC");
`profile.${sortBy}`,
descending ? "DESC" : "ASC"
);
} }
} else { } else {
query = query.orderBy("sort_order", "ASC") query = query
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC") .addOrderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC") .addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC") .addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC") .addOrderBy("orgChild3.orgChild3Order", "ASC")
.addOrderBy("orgChild4.orgChild4Order", "ASC") .addOrderBy("orgChild4.orgChild4Order", "ASC")
.addOrderBy("current_holders.posMasterNo", "ASC") .addOrderBy("current_holders.posMasterNo", "ASC");
} }
const [record, total] = await query const [record, total] = await query
@ -541,7 +531,7 @@ export class ProfileSalaryTempController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)` ? `current_holders.orgChild1Id IN (:...child1)`
: `current_holders.orgChild1Id is null` : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: "1=1", : "1=1",
{ {
child1: _data.child1, child1: _data.child1,
@ -755,30 +745,18 @@ export class ProfileSalaryTempController extends Controller {
.andWhere("current_holders.orgRootId = :rootId", { .andWhere("current_holders.orgRootId = :rootId", {
rootId: rootId, rootId: rootId,
}) })
.orderBy("current_holders.posMasterNo", "ASC") .orderBy("current_holders.posMasterNo", "ASC");
// .orderBy(`${sortBy}`, sort) // .orderBy(`${sortBy}`, sort)
if (sortBy) { if (sortBy) {
if (sortBy == "posLevel") { if (sortBy == "posLevel") {
query = query.orderBy( query = query.orderBy(`posLevel.posLevelName`, descending ? "DESC" : "ASC");
`posLevel.posLevelName`,
descending ? "DESC" : "ASC"
);
} else if (sortBy == "posType") { } else if (sortBy == "posType") {
query = query.orderBy( query = query.orderBy(`posType.posTypeName`, descending ? "DESC" : "ASC");
`posType.posTypeName`,
descending ? "DESC" : "ASC"
);
} else if (sortBy == "posNo") { } else if (sortBy == "posNo") {
query = query.orderBy( query = query.orderBy(`orgRoot.orgRootShortName`, descending ? "DESC" : "ASC");
`orgRoot.orgRootShortName`,
descending ? "DESC" : "ASC"
);
} else { } else {
query = query.orderBy( query = query.orderBy(`profileEmployee.${sortBy}`, descending ? "DESC" : "ASC");
`profileEmployee.${sortBy}`,
descending ? "DESC" : "ASC"
);
} }
} }
const [record, total] = await query const [record, total] = await query

2
src/interfaces/permission.ts
View file

@ -97,7 +97,7 @@ class CheckAuth {
} else if (privilege == "PARENT") { } else if (privilege == "PARENT") {
data = { data = {
root: [x.orgRootId], root: [x.orgRootId],
child1: null, child1: [null],
child2: null, child2: null,
child3: null, child3: null,
child4: null, child4: null,