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

เพิ่มรายละเอียดการออกคำสั่ง

Browse source
This commit is contained in:
Kittapath 2024-06-09 22:17:14 +07:00
parent 0276e8ec22
commit 364d1fc1a7
1 changed files with 34 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/controllers/PositionController.ts
View file

@ -309,9 +309,11 @@ export class PositionController extends Controller {
posDictField: requestBody.posDictField, posDictField: requestBody.posDictField,
posTypeId: requestBody.posTypeId, posTypeId: requestBody.posTypeId,
posLevelId: requestBody.posLevelId, posLevelId: requestBody.posLevelId,
posExecutiveId: requestBody.posExecutiveId?requestBody.posExecutiveId:"", posExecutiveId: requestBody.posExecutiveId ? requestBody.posExecutiveId : "",
posDictExecutiveField: requestBody.posDictExecutiveField?requestBody.posDictExecutiveField:"", posDictExecutiveField: requestBody.posDictExecutiveField
posDictArea: requestBody.posDictArea?requestBody.posDictArea:"", ? requestBody.posDictExecutiveField
: "",
posDictArea: requestBody.posDictArea ? requestBody.posDictArea : "",
isSpecial: requestBody.isSpecial, isSpecial: requestBody.isSpecial,
}, },
}); });
@ -321,16 +323,18 @@ export class PositionController extends Controller {
Object.assign(posDict, requestBody); Object.assign(posDict, requestBody);
posDict.lastUpdateUserId = request.user.sub; posDict.lastUpdateUserId = request.user.sub;
posDict.lastUpdateFullName = request.user.name; posDict.lastUpdateFullName = request.user.name;
posDict.posDictName = requestBody.posDictName, (posDict.posDictName = requestBody.posDictName),
posDict.posDictField = requestBody.posDictField, (posDict.posDictField = requestBody.posDictField),
posDict.posTypeId = requestBody.posTypeId, (posDict.posTypeId = requestBody.posTypeId),
posDict.posLevelId = requestBody.posLevelId, (posDict.posLevelId = requestBody.posLevelId),
posDict.posExecutiveId = requestBody.posExecutiveId?requestBody.posExecutiveId:null, (posDict.posExecutiveId = requestBody.posExecutiveId ? requestBody.posExecutiveId : null),
posDict.posDictExecutiveField = requestBody.posDictExecutiveField?requestBody.posDictExecutiveField:"", (posDict.posDictExecutiveField = requestBody.posDictExecutiveField
posDict.posDictArea = requestBody.posDictArea?requestBody.posDictArea:"", ? requestBody.posDictExecutiveField
posDict.isSpecial = requestBody.isSpecial, : ""),
// this.posDictRepository.merge(posDict, requestBody); (posDict.posDictArea = requestBody.posDictArea ? requestBody.posDictArea : ""),
await this.posDictRepository.save(posDict); (posDict.isSpecial = requestBody.isSpecial),
// this.posDictRepository.merge(posDict, requestBody);
await this.posDictRepository.save(posDict);
return new HttpSuccess(); return new HttpSuccess();
} }
@ -2553,15 +2557,13 @@ export class PositionController extends Controller {
where: { id: String(body.posLevel) }, where: { id: String(body.posLevel) },
}); });
if (body.typeCommand == "APPOINTED" || body.typeCommand == "MOVE") { if (body.typeCommand == "APPOINTED" || body.typeCommand == "MOVE") {
conditionA = conditionA = "positions.posTypeId LIKE :posType AND positions.posLevelId LIKE :posLevel";
"positions.posTypeId LIKE :posType AND positions.posLevelId LIKE :posLevel"; } else if (body.typeCommand == "APPOINT") {
} else if (body.typeCommand == "APPOINT") { conditionA = "posType.posTypeRank > :posTypeRank";
conditionA = "posType.posTypeRank > :posTypeRank"; } else if (body.typeCommand == "SLIP") {
} else if (body.typeCommand == "SLIP") { conditionA = "positions.posTypeId LIKE :posType AND posLevel.posLevelRank > :posLevelRank";
conditionA = }
"positions.posTypeId LIKE :posType AND posLevel.posLevelRank > :posLevelRank";
}
if (body.isAll == false) { if (body.isAll == false) {
if (body.node === 0) { if (body.node === 0) {
@ -3132,6 +3134,12 @@ export class PositionController extends Controller {
posMaster.current_holder.firstName + posMaster.current_holder.firstName +
" " + " " +
posMaster.current_holder.lastName; posMaster.current_holder.lastName;
// Construct org path
const _root = posMaster.orgRoot ? `${posMaster.orgRoot.orgRootName}` : "";
const _child1 = posMaster.orgChild1 ? `${posMaster.orgChild1.orgChild1Name}/` : "";
const _child2 = posMaster.orgChild2 ? `${posMaster.orgChild2.orgChild2Name}/` : "";
const _child3 = posMaster.orgChild3 ? `${posMaster.orgChild3.orgChild3Name}/` : "";
const _child4 = posMaster.orgChild4 ? `${posMaster.orgChild4.orgChild4Name}/` : "";
return { return {
id: posMaster.id, id: posMaster.id,
node: node, node: node,
@ -3147,9 +3155,13 @@ export class PositionController extends Controller {
orgShortname: shortName, orgShortname: shortName,
isSit: posMaster.isSit, isSit: posMaster.isSit,
name: fullname, name: fullname,
prefix: posMaster.current_holder.prefix,
firstName: posMaster.current_holder.firstName,
lastName: posMaster.current_holder.lastName,
profileId: posMaster.current_holder.id, profileId: posMaster.current_holder.id,
citizenId: posMaster.current_holder.citizenId, citizenId: posMaster.current_holder.citizenId,
position: posMaster.current_holder.position, position: posMaster.current_holder.position,
organizationName: `${_child4}${_child3}${_child2}${_child1}${_root}`,
}; };
}), }),
); );