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

no message

Browse source
This commit is contained in:
kittapath 2025-02-17 17:14:24 +07:00
parent b94d4e1b93
commit 573d2788be
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) {
// continue;
// }
if (item["FLAG_PERSON_TYPE"] != "6") {
continue;
}
// if (item["FLAG_PERSON_TYPE"] != "6") {
// continue;
// }
// if (new Date(item["RET_YEAR"]).getFullYear() >= 2567) {
// continue;
// }

11
src/controllers/ProfileController.ts
View file

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