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-15 14:55:56 +07:00
commit b94c5c2f09
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/CommandController.ts
View file

@ -3590,8 +3590,8 @@ export class CommandController extends Controller {
}); });
if ( if (
orgRevision != null && orgRevision != null &&
!["REPORT"].includes( !["REPORT", "DONE"].includes(
orgRevision.posMasters.find((x) => x.statusReport === "REPORT")?.statusReport || "", orgRevision.posMasters.find((x) => x.statusReport === "REPORT" || x.statusReport === "DONE")?.statusReport || "",
) )
) { ) {
await this.orgRevisionRepo.update(orgRevision.id, { await this.orgRevisionRepo.update(orgRevision.id, {

5
src/controllers/ProfileSalaryController.ts
View file

@ -131,6 +131,11 @@ export class ProfileSalaryController extends Controller {
history.profileSalaryId = data.id; history.profileSalaryId = data.id;
await this.salaryHistoryRepo.save(history, { data: req }); await this.salaryHistoryRepo.save(history, { data: req });
let null_:any = null;
profile.amount = body.amount ?? null_;
profile.positionSalaryAmount = body.positionSalaryAmount ?? null_;
profile.mouthSalaryAmount = body.mouthSalaryAmount ?? null_;
await this.profileRepo.save(profile);
return new HttpSuccess(); return new HttpSuccess();
} }

7
src/controllers/ProfileSalaryEmployeeController.ts
View file

@ -142,7 +142,12 @@ export class ProfileSalaryEmployeeController extends Controller {
setLogDataDiff(req, { before, after: data }); setLogDataDiff(req, { before, after: data });
history.profileSalaryId = data.id; history.profileSalaryId = data.id;
await this.salaryHistoryRepo.save(history, { data: req }); await this.salaryHistoryRepo.save(history, { data: req });
let null_:any = null;
profile.amount = body.amount ?? null_;
profile.positionSalaryAmount = body.positionSalaryAmount ?? null_;
profile.mouthSalaryAmount = body.mouthSalaryAmount ?? null_;
await this.profileRepo.save(profile);
return new HttpSuccess(); return new HttpSuccess();
} }