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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-07-12 10:23:24 +07:00
commit 83ca592a6d
6 changed files with 54 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/controllers/ReportController.ts
View file

@ -1470,17 +1470,13 @@ export class ReportController extends Controller {
profile: salaryProfileGroup1
? salaryProfileGroup1.map((item: any, index: any) => ({
no: Extension.ToThaiNumber(String(index + 1)),
fullname:
affiliation:
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
(item.root == undefined && item.root == null ? "" : item.root) +
"/" +
item.prefix +
item.firstName +
" " +
item.lastName, // สังกัด/ชื่อ-นามสกุล
(item.root == undefined && item.root == null ? "" : item.root),
fullName: item.prefix + item.firstName + " " + item.lastName,
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
@ -1550,17 +1546,13 @@ export class ReportController extends Controller {
profileGroup2: salaryProfileGroup2
? salaryProfileGroup2.map((item, index) => ({
no: Extension.ToThaiNumber(String(index + 1)),
fullname:
affiliation:
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
(item.root == undefined && item.root == null ? "" : item.root) +
"/" +
item.prefix +
item.firstName +
" " +
item.lastName, // สังกัด/ชื่อ-นามสกุล
(item.root == undefined && item.root == null ? "" : item.root),
fullName: item.prefix + item.firstName + " " + item.lastName,
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
@ -1923,11 +1915,10 @@ export class ReportController extends Controller {
const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null)
.join("/");
const position = profile.position;
return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullname: profile.prefix + profile.firstName + " " + profile.lastName,
position: position,
position: profile.position,
affiliation: affiliation,
posLevel: profile.posLevel,
posNumber:
@ -2018,11 +2009,10 @@ export class ReportController extends Controller {
const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null)
.join("/");
const position = profile.position;
return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullname: profile.prefix + profile.firstName + " " + profile.lastName,
position: position,
position: profile.position,
affiliation: affiliation,
posLevel: profile.posLevel,
posNumber:
@ -6289,7 +6279,7 @@ export class ReportController extends Controller {
});
if (salary != null) {
await new CallAPI()
.PostData(request, "org/profile/salary", {
.PostData(request, "/org/profile/salary", {
profileId: salary.profileId,
date: new Date(),
amount: salary.positionSalaryAmount,
@ -6337,7 +6327,7 @@ export class ReportController extends Controller {
});
if (salary != null) {
await new CallAPI()
.PostData(request, "org/profile/salary", {
.PostData(request, "/org/profile/salary", {
profileId: salary.profileId,
date: new Date(),
amount: salary.positionSalaryAmount,
@ -6385,7 +6375,7 @@ export class ReportController extends Controller {
});
if (salary != null) {
await new CallAPI()
.PostData(request, "org/profile/salary", {
.PostData(request, "/org/profile/salary", {
profileId: salary.profileId,
date: new Date(),
amount: salary.positionSalaryAmount,
@ -6433,7 +6423,7 @@ export class ReportController extends Controller {
});
if (salary != null) {
await new CallAPI()
.PostData(request, "org/profile/salary", {
.PostData(request, "/org/profile/salary", {
profileId: salary.profileId,
date: new Date(),
amount: salary.positionSalaryAmount,
@ -6481,7 +6471,7 @@ export class ReportController extends Controller {
});
if (salary != null) {
await new CallAPI()
.PostData(request, "org/profile-employee/salary", {
.PostData(request, "/org/profile-employee/salary", {
profileEmployeeId: salary.profileId,
date: new Date(),
amount: salary.positionSalaryAmount,