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

แก้คำสั่ง

Browse source
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2025-02-21 19:01:48 +07:00
parent b6834294e2
commit e3d0ed2082
1 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/controllers/ReportController.ts
View file

@ -1079,18 +1079,18 @@ export class ReportController extends Controller {
body: { body: {
refIds: { refIds: {
refId: string refId: string
commandAffectDate: Date | null
commandNo: string | null commandNo: string | null
commandYear: number | null
commandId: string | null commandId: string | null
commandYear: number remark: string | null
templateDoc: string | null
amount: Double | null amount: Double | null
amountSpecial?: Double | null amountSpecial?: Double | null
positionSalaryAmount: Double | null positionSalaryAmount: Double | null
mouthSalaryAmount: Double | null mouthSalaryAmount: Double | null
mpCee?: string | null commandCode?: string | null
refCommandCode?: string | null commandName?: string | null
refCommandName?: string | null commandDateAffect: Date | null
commandDateSign: Date | null
}[] }[]
} }
) { ) {
@ -1099,15 +1099,17 @@ export class ReportController extends Controller {
data: body.refIds.map(v => ({ data: body.refIds.map(v => ({
profileId: v.refId, profileId: v.refId,
commandId: v.commandId, commandId: v.commandId,
date: v.commandAffectDate,
refCommandNo: `${v.commandNo}/${Extension.ToThaiYear(v.commandYear)}`,
salaryRef: v.templateDoc,
amount: v.amount, amount: v.amount,
amountSpecial: v.amountSpecial, amountSpecial: v.amountSpecial,
positionSalaryAmount: v.positionSalaryAmount, positionSalaryAmount: v.positionSalaryAmount,
mouthSalaryAmount: v.mouthSalaryAmount, mouthSalaryAmount: v.mouthSalaryAmount,
refCommandCode: v.refCommandCode, commandNo: v.commandNo,
refCommandName: v.refCommandName, commandYear: v.commandYear,
commandDateAffect: v.commandDateAffect,
commandDateSign: v.commandDateSign,
commandCode: v.commandCode,
commandName: v.commandName,
remark: v.remark,
})), })),
}) })
.then(async res => { .then(async res => {
@ -1172,18 +1174,18 @@ export class ReportController extends Controller {
body: { body: {
refIds: { refIds: {
refId: string refId: string
commandAffectDate: Date | null
commandNo: string | null commandNo: string | null
commandYear: number | null
commandId: string | null commandId: string | null
commandYear: number remark: string | null
templateDoc: string | null
amount: Double | null amount: Double | null
amountSpecial?: Double | null amountSpecial?: Double | null
positionSalaryAmount: Double | null positionSalaryAmount: Double | null
mouthSalaryAmount: Double | null mouthSalaryAmount: Double | null
mpCee?: string | null commandCode?: string | null
refCommandCode?: string | null commandName?: string | null
refCommandName?: string | null commandDateAffect: Date | null
commandDateSign: Date | null
}[] }[]
} }
) { ) {
@ -1192,15 +1194,18 @@ export class ReportController extends Controller {
data: body.refIds.map(v => ({ data: body.refIds.map(v => ({
profileId: v.refId, profileId: v.refId,
commandId: v.commandId, commandId: v.commandId,
date: v.commandAffectDate,
refCommandNo: `${v.commandNo}/${Extension.ToThaiYear(v.commandYear)}`,
salaryRef: v.templateDoc,
amount: v.amount, amount: v.amount,
amountSpecial: v.amountSpecial,
positionSalaryAmount: v.positionSalaryAmount, positionSalaryAmount: v.positionSalaryAmount,
mouthSalaryAmount: v.mouthSalaryAmount, mouthSalaryAmount: v.mouthSalaryAmount,
isGovernment: false, isGovernment: false,
refCommandCode: v.refCommandCode, commandNo: v.commandNo,
refCommandName: v.refCommandName, commandYear: v.commandYear,
commandDateAffect: v.commandDateAffect,
commandDateSign: v.commandDateSign,
commandCode: v.commandCode,
commandName: v.commandName,
remark: v.remark,
})), })),
}) })
.then(async res => { .then(async res => {