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

fixed add isGovernment & commandDateAffect
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m12s
Details

Browse source
This commit is contained in:
Warunee Tamkoo 2026-04-28 16:53:15 +07:00
parent 2a5fba2dfc
commit 190a5d665a
4 changed files with 68 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/controllers/ImportDataController.ts
View file

@ -7053,24 +7053,12 @@ export class ImportDataController extends Controller {
salaryTemp.lastUpdateFullName = req.user?.name || "System Administrator";
// 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
if (
salaryTemp.commandCode === "12" ||
salaryTemp.commandCode === "15" ||
salaryTemp.commandCode === "16"
) {
if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
salaryTemp.isGovernment = false;
salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
else if (
salaryTemp.commandCode === "1" ||
salaryTemp.commandCode === "2" ||
salaryTemp.commandCode === "3" ||
salaryTemp.commandCode === "4" ||
salaryTemp.commandCode === "10" ||
salaryTemp.commandCode === "11" ||
salaryTemp.commandCode === "20"
) {
else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
salaryTemp.isGovernment = true;
salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
}
@ -7325,24 +7313,12 @@ export class ImportDataController extends Controller {
salaryTemp.lastUpdateFullName = req.user?.name || "System Administrator";
// 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
if (
salaryTemp.commandCode === "12" ||
salaryTemp.commandCode === "15" ||
salaryTemp.commandCode === "16"
) {
if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
salaryTemp.isGovernment = false;
salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
else if (
salaryTemp.commandCode === "1" ||
salaryTemp.commandCode === "2" ||
salaryTemp.commandCode === "3" ||
salaryTemp.commandCode === "4" ||
salaryTemp.commandCode === "10" ||
salaryTemp.commandCode === "11" ||
salaryTemp.commandCode === "20"
) {
else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
salaryTemp.isGovernment = true;
salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
}

22
src/controllers/ProfileSalaryController.ts
View file

@ -919,6 +919,17 @@ export class ProfileSalaryController extends Controller {
else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
}
Object.assign(data, { ...body, ...meta });
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
data.isGovernment = false;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
data.isGovernment = true;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
const history = new ProfileSalaryHistory();
Object.assign(history, { ...data, id: undefined });
await this.salaryRepo.save(data, { data: req });
@ -1043,6 +1054,17 @@ export class ProfileSalaryController extends Controller {
else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
}
Object.assign(record, body);
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
record.isGovernment = false;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
record.isGovernment = true;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
}
Object.assign(history, { ...record, id: undefined });
history.profileSalaryId = salaryId;

21
src/controllers/ProfileSalaryEmployeeController.ts
View file

@ -403,6 +403,17 @@ export class ProfileSalaryEmployeeController extends Controller {
else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
}
Object.assign(data, { ...body, ...meta });
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
data.isGovernment = false;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
data.isGovernment = true;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
const history = new ProfileSalaryHistory();
Object.assign(history, { ...data, id: undefined });
const _null: any = null;
@ -537,6 +548,16 @@ export class ProfileSalaryEmployeeController extends Controller {
else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
}
Object.assign(record, body);
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
record.isGovernment = false;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
record.isGovernment = true;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
}
Object.assign(history, { ...record, id: undefined });
history.profileSalaryId = salaryId;

25
src/controllers/ProfileSalaryTempController.ts
View file

@ -133,8 +133,8 @@ export class ProfileSalaryTempController extends Controller {
_data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)`
// : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: `current_holders.orgChild1Id is null`
: // : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
`current_holders.orgChild1Id is null`
: "1=1",
{
child1: _data.child1,
@ -545,8 +545,8 @@ export class ProfileSalaryTempController extends Controller {
_data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null
? `current_holders.orgChild1Id IN (:...child1)`
// : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: `current_holders.orgChild1Id is null`
: // : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
`current_holders.orgChild1Id is null`
: "1=1",
{
child1: _data.child1,
@ -1233,6 +1233,13 @@ export class ProfileSalaryTempController extends Controller {
isDelete: false,
};
Object.assign(data, { ...body, ...meta });
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
data.isGovernment = false;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
} else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
data.isGovernment = true;
if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
}
await this.salaryRepo.save(data, { data: req });
setLogDataDiff(req, { before, after: data });
@ -1509,6 +1516,16 @@ export class ProfileSalaryTempController extends Controller {
const before = structuredClone(record);
Object.assign(record, body);
// 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
if (["12", "15", "16"].includes(body.commandCode ?? "")) {
record.isGovernment = false;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
}
// 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
record.isGovernment = true;
if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
}
record.isEdit = true;
record.lastUpdateUserId = req.user.sub;