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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2025-02-26 14:13:15 +07:00
commit 299df901a1
6 changed files with 50 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/controllers/CommandController.ts
View file

@ -3452,8 +3452,8 @@ export class CommandController extends Controller {
isGovernment: item.isGovernment,
commandNo: item.commandNo,
commandYear: item.commandYear,
posNo: shortName,
posNoAbb: posNo,
posNo: posNo,
posNoAbb: shortName,
commandDateAffect: item.commandDateAffect,
commandDateSign: item.commandDateSign,
commandCode: item.commandCode,
@ -3640,8 +3640,8 @@ export class CommandController extends Controller {
isGovernment: item.isGovernment,
commandNo: item.commandNo,
commandYear: item.commandYear,
posNo: shortName,
posNoAbb: posNo,
posNo: posNo,
posNoAbb: shortName,
commandDateAffect: item.commandDateAffect,
commandDateSign: item.commandDateSign,
commandCode: item.commandCode,
@ -3869,8 +3869,8 @@ export class CommandController extends Controller {
isGovernment: item.isGovernment,
commandNo: item.commandNo,
commandYear: item.commandYear,
posNo: shortName,
posNoAbb: posNo,
posNo: posNo,
posNoAbb: shortName,
commandDateAffect: item.commandDateAffect,
commandDateSign: item.commandDateSign,
commandCode: item.commandCode,
@ -4093,8 +4093,8 @@ export class CommandController extends Controller {
lastUpdatedAt: new Date(),
commandNo: item.commandNo,
commandYear: item.commandYear,
posNo: shortName,
posNoAbb: posNo,
posNo: posNo,
posNoAbb: shortName,
commandDateAffect: item.commandDateAffect,
commandDateSign: item.commandDateSign,
commandCode: item.commandCode,
@ -4268,8 +4268,8 @@ export class CommandController extends Controller {
isGovernment: item.isGovernment,
commandNo: item.commandNo,
commandYear: item.commandYear,
posNo: shortName,
posNoAbb: posNo,
posNo: posNo,
posNoAbb: shortName,
commandDateAffect: item.commandDateAffect,
commandDateSign: item.commandDateSign,
commandCode: item.commandCode,
@ -4796,8 +4796,8 @@ export class CommandController extends Controller {
lastUpdatedAt: new Date(),
commandNo: item.commandNo,
commandYear: item.commandYear,
posNo: orgShortName,
posNoAbb: profile.posMasterNoTemp ?? "",
posNo: profile.posMasterNoTemp ?? "",
posNoAbb: orgShortName,
commandDateAffect: item.commandDateAffect,
commandDateSign: item.commandDateSign,
commandCode: item.commandCode,
@ -5050,8 +5050,8 @@ export class CommandController extends Controller {
lastUpdatedAt: new Date(),
commandNo: body.refIds[0].commandNo,
commandYear: body.refIds[0].commandYear,
posNo: shortName,
posNoAbb: item.posMaster.posMasterNo,
posNo: item.posMaster.posMasterNo,
posNoAbb: shortName,
commandDateAffect: body.refIds[0].commandDateAffect,
commandDateSign: body.refIds[0].commandDateSign,
commandCode: body.refIds[0].commandCode,
@ -5295,8 +5295,8 @@ export class CommandController extends Controller {
lastUpdatedAt: new Date(),
commandNo: item.commandNo,
commandYear: item.commandYear,
posNo: shortName,
posNoAbb: posMaster.posMasterNo,
posNo: posMaster.posMasterNo,
posNoAbb: shortName,
commandDateAffect: item.commandDateAffect,
commandDateSign: item.commandDateSign,
commandCode: item.commandCode,

12
src/controllers/ProfileEmployeeController.ts
View file

@ -2443,7 +2443,9 @@ export class ProfileEmployeeController extends Controller {
dateRetireLaw: profile.dateRetireLaw,
posMaster: posMaster == null ? null : posMaster.posMasterNo,
posMasterNo: posMaster == null ? null : posMaster.posMasterNo,
posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName,
posLevelName: profile.posLevel == null && profile.posType == null
? null
: `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}`,
posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,
posLevelId: profile.posLevel == null ? null : profile.posLevel.id,
posTypeName: profile.posType == null ? null : profile.posType.posTypeName,
@ -2834,7 +2836,9 @@ export class ProfileEmployeeController extends Controller {
posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName,
posLevelName: item.posLevel == null && item.posType == null
? null
: `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
educationDegree:
latestProfileEducation != null && latestProfileEducation.educationLevel != null
? latestProfileEducation.educationLevel
@ -4633,7 +4637,9 @@ export class ProfileEmployeeController extends Controller {
posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName,
posLevelName: item.posLevel == null && item.posType == null
? null
: `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`,
educationDegree:
latestProfileEducation != null && latestProfileEducation.educationLevel != null
? latestProfileEducation.educationLevel

6
src/controllers/ProfileGovernmentEmployeeController.ts
View file

@ -111,7 +111,7 @@ export class ProfileGovernmentEmployeeController extends Controller {
posLevel:
record.posType == null && record.posLevel == null
? null
: `${record.posType.posTypeShortName}${record.posLevel.posLevelName}`, //ระดับ
: `${record.posType.posTypeShortName} ${record.posLevel.posLevelName}`, //ระดับ
posMasterNo: posMaster == null ? null : `${orgShortName} ${posMaster.posMasterNo}`, //เลขที่ตำแหน่ง
posType: record.posType == null ? null : record.posType.posTypeName, //ประเภท
dateLeave: record.birthDate == null ? null : calculateRetireDate(record.birthDate),
@ -299,7 +299,9 @@ export class ProfileGovernmentEmployeeController extends Controller {
const data = {
org: org, //สังกัด
position: record.position, //ตำแหน่ง
posLevel: record.posLevel == null ? null : record.posLevel.posLevelName, //ระดับ
posLevel: record.posLevel == null && record.posType == null
? null
: `${record.posType.posTypeShortName} ${record.posLevel.posLevelName}`, //ระดับ
posMasterNo: posMaster == null ? null : `${orgShortName} ${posMaster.posMasterNo}`, //เลขที่ตำแหน่ง
posType: record.posType == null ? null : record.posType.posTypeName, //ประเภท
dateLeave: record.birthDate == null ? null : calculateRetireDate(record.birthDate), //วันเกษียณ