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

Merge branch 'develop' into adiDev

Browse source 
# Conflicts:
#	src/controllers/CommandController.ts
#	src/controllers/ProfileController.ts
This commit is contained in:
AdisakKanthawilang 2024-11-07 13:30:56 +07:00
commit 41c8b8263b
17 changed files with 1015 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/controllers/CommandController.ts
View file

@ -2527,6 +2527,7 @@ export class CommandController extends Controller {
date: item.date,
refCommandNo: item.refCommandNo,
templateDoc: item.salaryRef,
commandId: item.commandId,
position: profile.position,
positionType: profile.posType.posTypeName,
positionLevel: profile.posLevel.posLevelName,
@ -2559,7 +2560,18 @@ export class CommandController extends Controller {
await this.salaryHistoryRepo.save(history);
}),
);
const checkCommandType = await this.commandRepository.findOne({
where: { id: (body.data.length > 0 ? body.data[0].commandId?.toString() : "") },
relations: ["commandType"]
});
if(checkCommandType?.commandType.code == "C-PM-11") {
const profile = await this.profileRepository.find({ where: { id: In(body.data.map(x => x.profileId)) } });
const data = profile.map((x) => ({
...x,
isProbation: false,
}));
await this.profileRepository.save(data);
}
return new HttpSuccess();
}
@ -3254,14 +3266,14 @@ export class CommandController extends Controller {
no: Extension.ToThaiNumber((i + 1).toString()),
fullName: `${item.Prefix ?? ""}${item.FirstName ?? ""} ${item.LastName ?? ""}`,
oc:
(posMasterAct.posMasterChild?.current_holder?.position ?? "-") +
"/" +
/*(posMasterAct.posMasterChild?.current_holder?.position ?? "-") +
"/" +*/
(_organization ?? "-"),
postype: posMasterAct.posMasterChild?.current_holder?.posType?.posTypeName ?? "-",
poslevel: posMasterAct.posMasterChild?.current_holder?.posLevel?.posLevelName ?? "-",
organizationNew:
(posMasterAct.posMaster?.current_holder?.position ?? "-") +
"/" +
/*(posMasterAct.posMaster?.current_holder?.position ?? "-") +
"/" +*/
(_organizationNew ?? "-"),
// date: Extension.ToThaiShortDate_noPrefix(new Date()),
dateStart: "-",