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

fix issue #860 : ระบบทะเบียนประวัติ(ลูกจ้าง) เข้าแท็บเมนูข้อมูลข้าราชการ Error

Browse source
This commit is contained in:
Bright 2024-12-12 17:44:57 +07:00
parent 942c88a961
commit 6768a265de
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controllers/CommandController.ts
View file

@ -3474,6 +3474,7 @@ export class CommandController extends Controller {
const _null: any = null; const _null: any = null;
profile.employeeWage = item.amount == null ? _null : item.amount.toString(); profile.employeeWage = item.amount == null ? _null : item.amount.toString();
profile.dateStart = new Date(); profile.dateStart = new Date();
profile.dateAppoint = new Date();
profile.amount = item.amount == null ? _null : item.amount; profile.amount = item.amount == null ? _null : item.amount;
profile.amountSpecial = item.amountSpecial == null ? _null : item.amountSpecial; profile.amountSpecial = item.amountSpecial == null ? _null : item.amountSpecial;

2
src/interfaces/utils.ts
View file

@ -92,7 +92,7 @@ export async function calculateGovAge(profileId: string, type: string) {
} }
}) })
// const firstStartDate = new Date(records[0].date); // const firstStartDate = new Date(records[0].date);
const firstStartDate = profile?.dateAppoint; const firstStartDate = profile?.dateAppoint ? profile?.dateAppoint : new Date();
const firstEndDate = endDateFristRec ? new Date(endDateFristRec.dateGovernment) : new Date(); const firstEndDate = endDateFristRec ? new Date(endDateFristRec.dateGovernment) : new Date();
const { const {