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

แก้ชื่อฟิวผังเงินเดือนลูกจ้าง

Browse source
This commit is contained in:
Kittapath 2024-03-13 11:25:07 +07:00
parent 3128103f3a
commit 5fc5b1bb06
7 changed files with 48 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/entities/SalaryEmployees.ts
View file

@ -1,8 +1,5 @@
import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm";
import { Entity, Column, OneToMany } from "typeorm";
import { EntityBase } from "./base/Base";
import { SalaryRanks } from "./SalaryRanks";
import { PosType } from "./PosType";
import { PosLevel } from "./PosLevel";
import { SalaryRankEmployees } from "./SalaryRankEmployees";
@Entity("salaryEmployees")
@ -14,10 +11,11 @@ export class SalaryEmployees extends EntityBase {
name: string;
@Column({
length: 40,
nullable: true,
comment: "กลุ่มบัญชีการจ้าง",
default: null,
})
group: string;
group: number;
@Column({
comment: "สถานะการใช้งาน",
@ -68,7 +66,7 @@ export class CreateSalaryEmployee {
name: string;
@Column()
group: string;
group: number;
@Column()
isActive: boolean;
@ -91,7 +89,7 @@ export class UpdateSalaryEmployee {
name: string;
@Column()
group: string;
group: number;
@Column()
isActive: boolean;

9
src/entities/SalaryRankEmployees.ts
View file

@ -1,6 +1,5 @@
import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm";
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
import { EntityBase } from "./base/Base";
import { Salarys } from "./Salarys";
import { SalaryEmployees } from "./SalaryEmployees";
@Entity("salaryRankEmployees")
@ -23,7 +22,7 @@ export class SalaryRankEmployees extends EntityBase {
comment: "ค่าจ้างรายเดือน",
default: null,
})
salaryMounth: number | null;
salaryMonth: number | null;
@Column({
nullable: true,
@ -46,7 +45,7 @@ export class CreateSalaryRankEmployee {
step: number;
@Column()
salaryMounth?: number | null;
salaryMonth?: number | null;
@Column()
salaryDay?: number | null;
@ -57,7 +56,7 @@ export class UpdateSalaryRankEmployee {
step: number;
@Column()
salaryMounth?: number | null;
salaryMonth?: number | null;
@Column()
salaryDay?: number | null;

2
src/entities/SalaryRanks.ts
View file

@ -1,4 +1,4 @@
import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm";
import { Entity, Column, ManyToOne, JoinColumn } from "typeorm";
import { EntityBase } from "./base/Base";
import { Salarys } from "./Salarys";

2
src/entities/Salarys.ts
View file

@ -1,4 +1,4 @@
import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm";
import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm";
import { EntityBase } from "./base/Base";
import { SalaryRanks } from "./SalaryRanks";
import { PosType } from "./PosType";