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-17 17:47:30 +07:00
commit edf224d758
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/ImportDataController.ts
View file

@ -247,9 +247,9 @@ export class ImportDataController extends Controller {
// if (item["FLAG_RETIRE_STATUS"] != "" && item["FLAG_RETIRE_STATUS"] != null) { // if (item["FLAG_RETIRE_STATUS"] != "" && item["FLAG_RETIRE_STATUS"] != null) {
// continue; // continue;
// } // }
if (item["FLAG_PERSON_TYPE"] != "6") { // if (item["FLAG_PERSON_TYPE"] != "6") {
continue; // continue;
} // }
// if (new Date(item["RET_YEAR"]).getFullYear() >= 2567) { // if (new Date(item["RET_YEAR"]).getFullYear() >= 2567) {
// continue; // continue;
// } // }

11
src/controllers/ProfileController.ts
View file

@ -6641,9 +6641,10 @@ export class ProfileController extends Controller {
position: profile.position, position: profile.position,
leaveDate: profile.dateLeave, leaveDate: profile.dateLeave,
posMasterNo: posMaster == null ? null : posMaster.posMasterNo, posMasterNo: posMaster == null ? null : posMaster.posMasterNo,
posLevelName: profile.posType == null && profile.posLevel == null posLevelName:
? null profile.posType == null && profile.posLevel == null
: `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}`, ? null
: `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}`,
posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank, posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,
posLevelId: profile.posLevel == null ? null : profile.posLevel.id, posLevelId: profile.posLevel == null ? null : profile.posLevel.id,
posTypeName: profile.posType == null ? null : profile.posType.posTypeName, posTypeName: profile.posType == null ? null : profile.posType.posTypeName,
@ -8839,14 +8840,14 @@ export class ProfileController extends Controller {
*/ */
@Get("retireDate/mock") @Get("retireDate/mock")
async calRetireDate() { async calRetireDate() {
const profile = await this.profileRepo.find({ relations: ["profileSalary"] }); const profile = await this.profileEmpRepo.find();
const _null: any = null; const _null: any = null;
const profiles = profile.map((_data) => ({ const profiles = profile.map((_data) => ({
..._data, ..._data,
dateRetire: _data.birthDate == null ? _null : calculateRetireDate(_data.birthDate), dateRetire: _data.birthDate == null ? _null : calculateRetireDate(_data.birthDate),
dateRetireLaw: _data.birthDate == null ? _null : calculateRetireLaw(_data.birthDate), dateRetireLaw: _data.birthDate == null ? _null : calculateRetireLaw(_data.birthDate),
})); }));
await this.profileRepo.save(profiles); await this.profileEmpRepo.save(profiles);
return new HttpSuccess(); return new HttpSuccess();
} }
/** /**