hrms-bangkok/hrms-api-salary
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-03-10 12:53:11 +07:00
parent 3db68cd99c
commit 1fe092da16
1 changed files with 58 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/controllers/ReportController.ts
View file

@ -2503,7 +2503,6 @@ export class ReportController extends Controller {
@Path() salaryPeriodId: string, @Path() salaryPeriodId: string,
@Path() group: string, @Path() group: string,
) { ) {
const salaryPeriod = await this.salaryPeriodRepository.findOne({ const salaryPeriod = await this.salaryPeriodRepository.findOne({
where: { where: {
id: salaryPeriodId, id: salaryPeriodId,
@ -2580,38 +2579,39 @@ export class ReportController extends Controller {
root: item.root ?? "-", root: item.root ?? "-",
position: item.position ?? "-", position: item.position ?? "-",
posMasterNo: posMasterNo:
Extension.ToThaiNumber(item.orgShortName) + Extension.ToThaiNumber(String(item.posMasterNo)), Extension.ToThaiNumber(item.orgShortName) +
Extension.ToThaiNumber(String(item.posMasterNo)),
posTypeCurrent: item.posType ?? "-", posTypeCurrent: item.posType ?? "-",
posLevelCurrent: item.posLevel ?? "-", posLevelCurrent: item.posLevel ?? "-",
amountCurrent: item.amount ? Extension.ToThaiNumber(item.amount.toLocaleString()) : "-", amountCurrent: item.amount ? Extension.ToThaiNumber(item.amount.toLocaleString()) : "-",
posTypePrevious: salaryProfilePrevious.length > 0 posTypePrevious:
salaryProfilePrevious.length > 0
? (() => { ? (() => {
const filteredType = salaryProfilePrevious const filteredType = salaryProfilePrevious
.filter((profile) => profile.citizenId === item.citizenId) .filter((profile) => profile.citizenId === item.citizenId)
.map((profile) => profile.posType); .map((profile) => profile.posType);
const posType = filteredType[0]; const posType = filteredType[0];
return posType return posType ? posType : "-";
? posType : "-";
})() })()
: "-", : "-",
posLevelPrevious: salaryProfilePrevious.length > 0 posLevelPrevious:
salaryProfilePrevious.length > 0
? (() => { ? (() => {
const filteredLevel = salaryProfilePrevious const filteredLevel = salaryProfilePrevious
.filter((profile) => profile.citizenId === item.citizenId) .filter((profile) => profile.citizenId === item.citizenId)
.map((profile) => profile.posLevel); .map((profile) => profile.posLevel);
const posLevel = filteredLevel[0]; const posLevel = filteredLevel[0];
return posLevel return posLevel ? posLevel : "-";
? posLevel : "-";
})() })()
: "-", : "-",
amountPrevious: salaryProfilePrevious.length > 0 amountPrevious:
salaryProfilePrevious.length > 0
? (() => { ? (() => {
const filteredAmount = salaryProfilePrevious const filteredAmount = salaryProfilePrevious
.filter((profile) => profile.citizenId === item.citizenId) .filter((profile) => profile.citizenId === item.citizenId)
.map((profile) => profile.amount); .map((profile) => profile.amount);
const amount = filteredAmount[0]; const amount = filteredAmount[0];
return amount return amount ? Extension.ToThaiNumber(amount.toLocaleString()) : "-";
? Extension.ToThaiNumber(amount.toLocaleString()):"-"
})() })()
: "-", : "-",
deduction: "-", //เงินปรับลด deduction: "-", //เงินปรับลด
@ -2622,8 +2622,7 @@ export class ReportController extends Controller {
specialPromote: "-", //ลำดับการเลื่อนกรณีพิเศษ specialPromote: "-", //ลำดับการเลื่อนกรณีพิเศษ
remark: item.remark ?? "-", remark: item.remark ?? "-",
temporaryPayment: "-", //ถือจ่ายชั่วคราวขั้น temporaryPayment: "-", //ถือจ่ายชั่วคราวขั้น
})) }));
return new HttpSuccess({ return new HttpSuccess({
template: "gov2-10", template: "gov2-10",
@ -7984,11 +7983,11 @@ export class ReportController extends Controller {
positionLevel: salary.posLevel, positionLevel: salary.posLevel,
commandId: v.commandId, commandId: v.commandId,
remark: v.remark, remark: v.remark,
orgRoot: salary.root, orgRootName: salary.root,
orgChild1: salary.child1, orgChild1Name: salary.child1,
orgChild2: salary.child2, orgChild2Name: salary.child2,
orgChild3: salary.child3, orgChild3Name: salary.child3,
orgChild4: salary.child4, orgChild4Name: salary.child4,
commandCode: v.commandCode, commandCode: v.commandCode,
commandName: v.commandName, commandName: v.commandName,
commandNo: v.commandNo, commandNo: v.commandNo,
@ -8024,7 +8023,7 @@ export class ReportController extends Controller {
refId: string; refId: string;
// commandAffectDate: Date | null;//เก่า // commandAffectDate: Date | null;//เก่า
commandDateAffect: Date | null; //ใหม่ (ปรับตาม rabbitMQ ORG) commandDateAffect: Date | null; //ใหม่ (ปรับตาม rabbitMQ ORG)
commandDateSign?: Date | null commandDateSign?: Date | null;
commandNo: string | null; commandNo: string | null;
commandYear: number | null; commandYear: number | null;
commandId: string | null; commandId: string | null;