fix SalaryEmployee ลบไฟล์ รวมไฟล์ เพิ่ม field

This commit is contained in:
AnandaTon 2024-05-16 15:03:29 +07:00
parent 42bad7b302
commit 3b5096c005
7 changed files with 55 additions and 920 deletions

View file

@ -15,9 +15,9 @@ import {
import { AppDataSource } from "../database/data-source";
import {
CreateProfileSalaryEmployee,
ProfileSalaryEmployee,
ProfileSalary,
UpdateProfileSalaryEmployee,
} from "../entities/ProfileSalaryEmployee";
} from "../entities/ProfileSalary";
import HttpSuccess from "../interfaces/http-success";
import HttpStatus from "../interfaces/http-status";
import HttpError from "../interfaces/http-error";
@ -31,13 +31,13 @@ import { LessThan, MoreThan } from "typeorm";
@Security("bearerAuth")
export class ProfileSalaryEmployeeController extends Controller {
private profileRepo = AppDataSource.getRepository(ProfileEmployee);
private salaryRepo = AppDataSource.getRepository(ProfileSalaryEmployee);
private salaryRepo = AppDataSource.getRepository(ProfileSalary);
private salaryHistoryRepo = AppDataSource.getRepository(ProfileSalaryHistory);
@Get("{profileId}")
public async getSalary(@Path() profileId: string) {
const record = await this.salaryRepo.find({
where: { profileId: profileId },
where: { profileEmployeeId: profileId },
order: { order: "ASC" },
});
return new HttpSuccess(record);
@ -56,22 +56,22 @@ export class ProfileSalaryEmployeeController extends Controller {
@Request() req: RequestWithUser,
@Body() body: CreateProfileSalaryEmployee,
) {
if (!body.profileId) {
throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileId");
if (!body.profileEmployeeId) {
throw new HttpError(HttpStatus.BAD_REQUEST, "กรุณากรอก profileEmployeeId");
}
const profile = await this.profileRepo.findOneBy({ id: body.profileId });
const profile = await this.profileRepo.findOneBy({ id: body.profileEmployeeId });
if (!profile) {
throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
}
const dest_item = await this.salaryRepo.findOne({
where: { profileId: body.profileId },
where: { profileId: body.profileEmployeeId },
order: { order: "DESC" },
});
const data = new ProfileSalaryEmployee();
const data = new ProfileSalary();
const meta = {
order: dest_item == null ? 1 : dest_item.order + 1,