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

เพิ่มฟิลด์ yearSlice บัญชีการคำนวณโควตา

Browse source
This commit is contained in:
Bright 2024-04-09 16:47:04 +07:00
parent 9132d4cd99
commit 0d42cf022c
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/controllers/ReportController.ts
View file

@ -556,11 +556,12 @@ export class ReportController extends Controller {
template: "gov1-02",
reportName: "gov1-02",
data: {
date: Extension.ToThaiNumber(
Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
),
// date: Extension.ToThaiNumber(
// Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
// ),
year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
yearSlice: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year)).slice(-2)),
// dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
agency: agency,
data1: formattedData1,
data2: formattedData2,
@ -1025,11 +1026,12 @@ export class ReportController extends Controller {
template: "gov2-02",
reportName: "gov2-02",
data: {
date: Extension.ToThaiNumber(
Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
),
// date: Extension.ToThaiNumber(
// Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
// ),
year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
yearSlice: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year)).slice(-2)),
// dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
agency: agency,
data1: formattedData1,
data2: formattedData2,