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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
kittapath 2024-11-12 16:51:19 +07:00
commit 23f351a135
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/controllers/CommandController.ts
View file

@ -3451,6 +3451,7 @@ export class CommandController extends Controller {
posMasterId: posMaster.id, posMasterId: posMaster.id,
positionIsSelected: true, positionIsSelected: true,
}, },
relations: ["posType", "posLevel"]
}); });
const dest_item = await this.salaryRepo.findOne({ const dest_item = await this.salaryRepo.findOne({
where: { profileId: profile?.id }, where: { profileId: profile?.id },
@ -3468,8 +3469,8 @@ export class CommandController extends Controller {
mouthSalaryAmount: item.mouthSalaryAmount, mouthSalaryAmount: item.mouthSalaryAmount,
posNo: shortName ?? null, posNo: shortName ?? null,
position: position?.positionName ?? null, position: position?.positionName ?? null,
positionType: position?.posTypeId ?? null, positionType: position?.posType.posTypeName ?? null,
positionLevel: position?.posLevelId ?? null, positionLevel: position?.posLevel.posLevelName ?? null,
refCommandNo: `${item.commandNo}/${Extension.ToThaiYear(item.commandYear)}`, refCommandNo: `${item.commandNo}/${Extension.ToThaiYear(item.commandYear)}`,
templateDoc: item.templateDoc, templateDoc: item.templateDoc,
order: dest_item == null ? 1 : dest_item.order + 1, order: dest_item == null ? 1 : dest_item.order + 1,
@ -3521,13 +3522,13 @@ export class CommandController extends Controller {
body: { body: {
refIds: { refIds: {
refId: string; refId: string;
commandAffectDate: Date | null; // commandAffectDate: Date | null;
commandNo: string | null; // commandNo: string | null;
commandYear: number; // commandYear: number;
templateDoc: string | null; // templateDoc: string | null;
amount: Double | null; // amount: Double | null;
positionSalaryAmount: Double | null; // positionSalaryAmount: Double | null;
mouthSalaryAmount: Double | null; // mouthSalaryAmount: Double | null;
}[]; }[];
}, },
) { ) {