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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-16 15:22:30 +07:00
parent 0524653f4b
commit 4dac692284
7 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/ProfileAddressController.ts
View file

@ -68,10 +68,10 @@ export class ProfileAddressController extends Controller {
* @summary ประวัติแก้ไขที่อยู่
*
*/
@Get("history/{addressId}")
public async getProfileAddressHistory(@Path() addressId: string) {
@Get("history/{profileId}")
public async getProfileAddressHistory(@Path() profileId: string) {
const record = await this.profileAddressHistoryRepo.find({
where: { profileId: addressId },
where: { profileId: profileId },
relations: {
registrationProvince: true,
registrationDistrict: true,
@ -106,13 +106,13 @@ export class ProfileAddressController extends Controller {
* @summary แก้ไขที่อยู่
*
*/
@Patch("{addressId}")
@Patch("{profileId}")
public async editProfileAddress(
@Body() requestBody: UpdateProfileAddress,
@Request() req: RequestWithUser,
@Path() addressId: string,
@Path() profileId: string,
) {
const record = await this.profileRepo.findOneBy({ id: addressId });
const record = await this.profileRepo.findOneBy({ id: profileId });
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
const history = new ProfileAddressHistory();
@ -120,7 +120,7 @@ export class ProfileAddressController extends Controller {
Object.assign(history, { ...record, id: undefined });
Object.assign(record, requestBody);
history.profileId = addressId;
history.profileId = profileId;
history.lastUpdateFullName = req.user.name;
record.lastUpdateFullName = req.user.name;

14
src/controllers/ProfileAddressEmployeeController.ts
View file

@ -69,10 +69,10 @@ export class ProfileAddressEmployeeController extends Controller {
* @summary ประวัติแก้ไขที่อยู่
*
*/
@Get("history/{addressId}")
public async getProfileAddressHistory(@Path() addressId: string) {
@Get("history/{profileId}")
public async getProfileAddressHistory(@Path() profileId: string) {
const record = await this.profileAddressHistoryRepo.find({
where: { profileEmployeeId: addressId },
where: { profileEmployeeId: profileId },
relations: {
registrationProvince: true,
registrationDistrict: true,
@ -107,13 +107,13 @@ export class ProfileAddressEmployeeController extends Controller {
* @summary แก้ไขที่อยู่
*
*/
@Patch("{addressId}")
@Patch("{profileId}")
public async editProfileAddress(
@Body() requestBody: UpdateProfileAddressEmployee,
@Request() req: RequestWithUser,
@Path() addressId: string,
@Path() profileId: string,
) {
const record = await this.profileEmployeeRepo.findOneBy({ id: addressId });
const record = await this.profileEmployeeRepo.findOneBy({ id: profileId });
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
const history = new ProfileAddressHistory();
@ -121,7 +121,7 @@ export class ProfileAddressEmployeeController extends Controller {
Object.assign(history, { ...record, id: undefined });
Object.assign(record, requestBody);
history.profileEmployeeId = addressId;
history.profileEmployeeId = profileId;
history.lastUpdateFullName = req.user.name;
record.lastUpdateFullName = req.user.name;

2
src/controllers/ProfileChangeNameController.ts
View file

@ -159,7 +159,7 @@ export class ProfileChangeNameController extends Controller {
const chkLastRecord = await this.changeNameRepository.findOne({
where:{
profileEmployeeId: record.profileEmployeeId
profileId: record.profileId
},
order:{
createdAt: "DESC"

2
src/controllers/ProfileChangeNameEmployeeController.ts
View file

@ -178,7 +178,7 @@ export class ProfileChangeNameEmployeeController extends Controller {
await this.profileEmployeeRepo.save(profile);
}
return new HttpSuccess([chkLastRecord.id,record.id]);
return new HttpSuccess();
}
@Delete("{changeNameId}")

6
src/controllers/ProfileController.ts
View file

@ -31,7 +31,7 @@ import { OrgRevision } from "../entities/OrgRevision";
import { PosMaster } from "../entities/PosMaster";
import { PosLevel } from "../entities/PosLevel";
import { PosType } from "../entities/PosType";
import { calculateAge, calculateRetireDate, calculateRetireYear } from "../interfaces/utils";
import { calculateAge, calculateRetireDate, calculateRetireLaw, calculateRetireYear } from "../interfaces/utils";
import { RequestWithUser } from "../middlewares/user";
import { Position } from "../entities/Position";
@ -242,7 +242,7 @@ export class ProfileController extends Controller {
profile.lastUpdateUserId = request.user.sub;
profile.lastUpdateFullName = request.user.name;
profile.dateRetire = calculateRetireDate(profile.birthDate);
// profile.dateRetireLaw = calculateRetireDate(profile.birthDate);
profile.dateRetireLaw = calculateRetireLaw(profile.birthDate);
await this.profileRepo.save(profile);
@ -383,7 +383,7 @@ export class ProfileController extends Controller {
record.lastUpdateUserId = request.user.sub;
record.lastUpdateFullName = request.user.name;
record.dateRetire = calculateRetireDate(record.birthDate);
// record.dateRetireLaw = calculateRetireDate(record.birthDate);
record.dateRetireLaw = calculateRetireLaw(record.birthDate);
await this.profileRepo.save(record);
return new HttpSuccess();

6
src/controllers/ProfileEmployeeController.ts
View file

@ -20,7 +20,7 @@ import HttpStatus from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
import { Brackets, IsNull, Like, Not } from "typeorm";
import { OrgRevision } from "../entities/OrgRevision";
import { calculateRetireDate } from "../interfaces/utils";
import { calculateRetireDate, calculateRetireLaw } from "../interfaces/utils";
import { EmployeePosMaster } from "../entities/EmployeePosMaster";
import {
ProfileEmployee,
@ -115,7 +115,7 @@ export class ProfileEmployeeController extends Controller {
profile.lastUpdateUserId = request.user.sub;
profile.lastUpdateFullName = request.user.name;
profile.dateRetire = calculateRetireDate(profile.birthDate);
// profile.dateRetireLaw = calculateRetireDate(profile.birthDate);
profile.dateRetireLaw = calculateRetireLaw(profile.birthDate);
await this.profileRepo.save(profile);
return new HttpSuccess();
@ -205,7 +205,7 @@ export class ProfileEmployeeController extends Controller {
record.lastUpdateUserId = request.user.sub;
record.lastUpdateFullName = request.user.name;
record.dateRetire = calculateRetireDate(record.birthDate);
// record.dateRetireLaw = calculateRetireDate(record.birthDate);
record.dateRetireLaw = calculateRetireLaw(record.birthDate);
await this.profileRepo.save(record);

4
src/interfaces/utils.ts
View file

@ -41,6 +41,10 @@ export function calculateRetireDate(birthDate: Date) {
return new Date(`${yy + 61}-09-30T00:00:00.000+07:00`);
}
export function calculateRetireLaw(birthDate: Date) {
let yy = birthDate.getFullYear();
return new Date(`${yy + 60}-09-30T00:00:00.000+07:00`);
}
export function calculateRetireYear(birthDate: Date) {
let dd = birthDate.getDate();