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

ปรับออกคำสั่งลงตำแหน่ง

Browse source
This commit is contained in:
kittapath 2025-02-21 19:10:27 +07:00
parent c5e0fcc4f7
commit e305ea7a88
20 changed files with 1317 additions and 1183 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/entities/CommandType.ts
View file

@ -30,11 +30,11 @@ export class CommandType extends EntityBase {
@Column({
nullable: true,
comment: "รหัสประเภทของคำสั่งแต่งตั้ง",
comment: "รหัสประเภทของคำสั่ง",
length: 255,
default: null,
})
refCommandCode: string;
commandCode: string;
@Column({
nullable: true,

281
src/entities/ProfileSalary.ts
View file

@ -25,11 +25,61 @@ export class ProfileSalary extends EntityBase {
profileEmployeeId: string;
@Column({
comment: "วันที่",
nullable: true,
comment: "เรียงลำดับใหมาตามการนำเข้า",
default: null,
})
order: number;
@Column({
nullable: true,
comment: "เลขที่คำสั่ง",
default: null,
})
commandNo: number;
@Column({
nullable: true,
comment: "ปีที่ออกคำสั่ง",
default: null,
})
commandYear: number;
@Column({
comment: "คำสั่งวันที่",
type: "datetime",
nullable: true,
})
date: Date;
commandDateSign: Date;
@Column({
comment: "คำสั่งมีผลวันที่",
type: "datetime",
nullable: true,
})
commandDateAffect: Date;
@Column({
nullable: true,
comment: "รหัสประเภทของคำสั่ง",
default: null,
})
commandCode: string;
@Column({
nullable: true,
comment: "ชื่อประเภทคำสั่ง",
default: null,
})
commandName: string;
@Column({
nullable: true,
length: 40,
comment: "ตัวย่อเลขที่ตำแหน่ง",
default: null,
})
posNoAbb: string;
@Column({
nullable: true,
@ -45,31 +95,7 @@ export class ProfileSalary extends EntityBase {
comment: "ตำแหน่ง",
default: null,
})
position: string;
@Column({
nullable: true,
length: 255,
comment: "สายงาน",
default: null,
})
positionLine: string;
@Column({
nullable: true,
length: 255,
comment: "ด้าน/สาขา",
default: null,
})
positionPathSide: string;
@Column({
nullable: true,
length: 255,
comment: "ตำแหน่งทางการบริหาร",
default: null,
})
positionExecutive: string;
positionName: string;
@Column({
nullable: true,
@ -88,44 +114,11 @@ export class ProfileSalary extends EntityBase {
positionLevel: string;
@Column({
comment: "เงินเดือนฐาน",
default: 0,
nullable: true,
type: "double",
comment: "ระดับของเก่าที่ยังไม่เทียบเท่าแบบแท่ง",
default: null,
})
amount: Double;
@Column({
comment: "เงินพิเศษ",
default: 0,
nullable: true,
type: "double",
})
amountSpecial: Double;
@Column({
comment: "เงินประจำตำแหน่ง",
default: 0,
nullable: true,
type: "double",
})
positionSalaryAmount: Double;
@Column({
comment: "เงินค่าตอบแทนรายเดือน",
default: 0,
nullable: true,
type: "double",
})
mouthSalaryAmount: Double;
// @Column({
// nullable: true,
// comment: "ประเภทคำสั่ง",
// type: "text",
// default: null,
// })
// commandType: string;
positionCee: string;
@Column({
nullable: true,
@ -164,54 +157,51 @@ export class ProfileSalary extends EntityBase {
@Column({
nullable: true,
comment: "ระดับ",
length: 255,
comment: "ตำแหน่งทางการบริหาร",
default: null,
})
mpCee: string;
positionExecutive: string;
@Column({
comment: "เงินเดือนฐาน",
default: 0,
nullable: true,
type: "double",
})
amount: Double;
@Column({
comment: "เงินพิเศษ",
default: 0,
nullable: true,
type: "double",
})
amountSpecial: Double;
@Column({
comment: "เงินประจำตำแหน่ง",
default: 0,
nullable: true,
type: "double",
})
positionSalaryAmount: Double;
@Column({
comment: "เงินค่าตอบแทนรายเดือน",
default: 0,
nullable: true,
type: "double",
})
mouthSalaryAmount: Double;
@Column({
nullable: true,
comment: "รหัสประเภทของคำสั่งแต่งตั้ง",
length: 255,
comment: "หมายเหตุ",
default: null,
})
refCommandCode: string;
@Column({
nullable: true,
comment: "ชื่อประเภทคำสั่ง",
default: null,
})
refCommandName: string;
@Column({
nullable: true,
comment: "เลขที่คำสั่ง",
type: "text",
default: null,
})
refCommandNo: string;
@Column({
comment: "วันที่ออกคำสั่ง",
type: "datetime",
nullable: true,
})
refCommandDate: Date;
@Column({
nullable: true,
comment: "เอกสารอ้างอิง",
type: "text",
default: null,
})
templateDoc: string;
@Column({
nullable: true,
comment: "ลำดับตำแหน่ง",
default: null,
})
order: number;
remark: string;
@Column({
comment: "วันที่",
@ -253,110 +243,107 @@ export class ProfileSalary extends EntityBase {
export class CreateProfileSalary {
profileId: string;
date?: Date | null;
commandDateAffect?: Date | null;
commandDateSign?: Date | null;
amount?: Double | null;
amountSpecial?: Double | null;
positionSalaryAmount?: Double | null;
mouthSalaryAmount?: Double | null;
posNo: string | null;
position: string | null;
positionLine: string | null;
positionPathSide: string | null;
posNoAbb: string | null;
positionName: string | null;
positionExecutive: string | null;
positionType: string | null;
positionLevel: string | null;
refCommandNo: string | null;
commandId?: string | null;
// commandType?: string | null;
templateDoc: string | null;
remark: string | null;
isGovernment?: boolean | null;
orgRoot?: string | null;
orgChild1?: string | null;
orgChild2?: string | null;
orgChild3?: string | null;
orgChild4?: string | null;
mpCee?: string | null;
refCommandCode?: string | null;
refCommandName?: string | null;
positionCee?: string | null;
commandCode?: string | null;
commandName?: string | null;
commandNo?: number | null;
commandYear?: number | null;
}
export class CreateProfileSalaryEmployee {
profileEmployeeId: string | null;
date?: Date | null;
commandDateAffect?: Date | null;
commandDateSign?: Date | null;
amount?: Double | null;
amountSpecial?: Double | null;
commandId?: string | null;
positionSalaryAmount?: Double | null;
mouthSalaryAmount?: Double | null;
posNo: string | null;
position: string | null;
// positionLine: string | null;
// positionPathSide: string | null;
// positionExecutive: string | null;
posNoAbb: string | null;
positionName: string | null;
positionType: string | null;
positionLevel: string | null;
refCommandNo: string | null;
templateDoc: string | null;
remark: string | null;
orgRoot?: string | null;
orgChild1?: string | null;
orgChild2?: string | null;
orgChild3?: string | null;
orgChild4?: string | null;
mpCee?: string | null;
refCommandCode?: string | null;
refCommandName?: string | null;
positionCee?: string | null;
commandCode?: string | null;
commandName?: string | null;
commandNo?: number | null;
commandYear?: number | null;
}
export class UpdateProfileSalaryEmployee {
date?: Date | null;
commandDateAffect?: Date | null;
commandDateSign?: Date | null;
amount?: Double | null;
amountSpecial?: Double | null;
positionSalaryAmount?: Double | null;
mouthSalaryAmount?: Double | null;
posNo: string | null;
position: string | null;
// positionLine: string | null;
// positionPathSide: string | null;
// positionExecutive: string | null;
posNoAbb: string | null;
positionName: string | null;
positionType: string | null;
positionLevel: string | null;
refCommandNo: string | null;
templateDoc: string | null;
remark: string | null;
orgRoot?: string | null;
orgChild1?: string | null;
orgChild2?: string | null;
orgChild3?: string | null;
orgChild4?: string | null;
mpCee?: string | null;
refCommandCode?: string | null;
refCommandName?: string | null;
positionCee?: string | null;
commandCode?: string | null;
commandName?: string | null;
commandNo?: number | null;
commandYear?: number | null;
}
export type UpdateProfileSalary = {
date?: Date | null;
commandDateAffect?: Date | null;
commandDateSign?: Date | null;
amount?: Double | null;
amountSpecial?: Double | null;
positionSalaryAmount?: Double | null;
mouthSalaryAmount?: Double | null;
posNo?: string | null;
position?: string | null;
positionLine?: string | null;
positionPathSide?: string | null;
posNoAbb: string | null;
positionName: string | null;
positionExecutive?: string | null;
positionType?: string | null;
positionLevel?: string | null;
refCommandNo?: string | null;
templateDoc?: string | null;
remark?: string | null;
orgRoot?: string | null;
orgChild1?: string | null;
orgChild2?: string | null;
orgChild3?: string | null;
orgChild4?: string | null;
mpCee?: string | null;
refCommandCode?: string | null;
refCommandName?: string | null;
positionCee?: string | null;
commandCode?: string | null;
commandName?: string | null;
commandNo?: number | null;
commandYear?: number | null;
};

213
src/entities/ProfileSalaryHistory.ts
View file

@ -5,19 +5,62 @@ import { Command } from "./Command";
@Entity("profileSalaryHistory")
export class ProfileSalaryHistory extends EntityBase {
// @Column({
// length: 40,
// comment: "คีย์นอก(FK)ของตาราง profile",
// type: "uuid",
// })
// profileId: string;
@Column({
nullable: true,
comment: "เรียงลำดับใหมาตามการนำเข้า",
default: null,
})
order: number;
@Column({
comment: "วันที่",
nullable: true,
comment: "เลขที่คำสั่ง",
default: null,
})
commandNo: number;
@Column({
nullable: true,
comment: "ปีที่ออกคำสั่ง",
default: null,
})
commandYear: number;
@Column({
comment: "คำสั่งวันที่",
type: "datetime",
nullable: true,
})
date: Date;
commandDateSign: Date;
@Column({
comment: "คำสั่งมีผลวันที่",
type: "datetime",
nullable: true,
})
commandDateAffect: Date;
@Column({
nullable: true,
comment: "รหัสประเภทของคำสั่ง",
default: null,
})
commandCode: string;
@Column({
nullable: true,
comment: "ชื่อประเภทคำสั่ง",
default: null,
})
commandName: string;
@Column({
nullable: true,
length: 40,
comment: "ตัวย่อเลขที่ตำแหน่ง",
default: null,
})
posNoAbb: string;
@Column({
nullable: true,
@ -33,31 +76,7 @@ export class ProfileSalaryHistory extends EntityBase {
comment: "ตำแหน่ง",
default: null,
})
position: string;
@Column({
nullable: true,
length: 255,
comment: "สายงาน",
default: null,
})
positionLine: string;
@Column({
nullable: true,
length: 255,
comment: "ด้าน/สาขา",
default: null,
})
positionPathSide: string;
@Column({
nullable: true,
length: 255,
comment: "ตำแหน่งทางการบริหาร",
default: null,
})
positionExecutive: string;
positionName: string;
@Column({
nullable: true,
@ -76,44 +95,11 @@ export class ProfileSalaryHistory extends EntityBase {
positionLevel: string;
@Column({
comment: "เงินเดือนฐาน",
default: 0,
nullable: true,
type: "double",
comment: "ระดับของเก่าที่ยังไม่เทียบเท่าแบบแท่ง",
default: null,
})
amount: Double;
@Column({
comment: "เงินพิเศษ",
default: 0,
nullable: true,
type: "double",
})
amountSpecial: Double;
@Column({
comment: "เงินประจำตำแหน่ง",
default: 0,
nullable: true,
type: "double",
})
positionSalaryAmount: Double;
@Column({
comment: "เงินค่าตอบแทนรายเดือน",
default: 0,
nullable: true,
type: "double",
})
mouthSalaryAmount: Double;
// @Column({
// nullable: true,
// comment: "ประเภทคำสั่ง",
// type: "text",
// default: null,
// })
// commandType: string;
positionCee: string;
@Column({
nullable: true,
@ -152,47 +138,65 @@ export class ProfileSalaryHistory extends EntityBase {
@Column({
nullable: true,
comment: "ระดับ",
length: 255,
comment: "ตำแหน่งทางการบริหาร",
default: null,
})
mpCee: string;
positionExecutive: string;
@Column({
comment: "เงินเดือนฐาน",
default: 0,
nullable: true,
type: "double",
})
amount: Double;
@Column({
comment: "เงินพิเศษ",
default: 0,
nullable: true,
type: "double",
})
amountSpecial: Double;
@Column({
comment: "เงินประจำตำแหน่ง",
default: 0,
nullable: true,
type: "double",
})
positionSalaryAmount: Double;
@Column({
comment: "เงินค่าตอบแทนรายเดือน",
default: 0,
nullable: true,
type: "double",
})
mouthSalaryAmount: Double;
@Column({
nullable: true,
comment: "รหัสประเภทของคำสั่งแต่งตั้ง",
length: 255,
comment: "หมายเหตุ",
default: null,
})
refCommandCode: string;
remark: string;
@Column({
nullable: true,
comment: "ชื่อประเภทคำสั่ง",
default: null,
})
refCommandName: string;
@Column({
nullable: true,
comment: "เลขที่คำสั่ง",
type: "text",
default: null,
})
refCommandNo: string;
@Column({
comment: "วันที่ออกคำสั่ง",
comment: "วันที่",
type: "datetime",
nullable: true,
})
refCommandDate: Date;
dateGovernment: Date;
@Column({
nullable: true,
comment: "เอกสารอ้างอิง",
type: "text",
comment: "เข้ารับราชการ",
default: null,
})
templateDoc: string;
isGovernment: boolean;
@Column({
length: 40,
@ -200,13 +204,6 @@ export class ProfileSalaryHistory extends EntityBase {
})
profileSalaryId: string;
@Column({
nullable: true,
comment: "ลำดับตำแหน่ง",
default: null,
})
order: number;
@Column({
nullable: true,
length: 40,
@ -239,16 +236,16 @@ export class CreateProfileSalaryHistory {
positionType: string | null;
positionLevel: string | null;
refCommandNo: string | null;
templateDoc: string | null;
remark: string | null;
orgRoot?: string | null;
orgChild1?: string | null;
orgChild2?: string | null;
orgChild3?: string | null;
orgChild4?: string | null;
mpCee?: string | null;
refCommandCode?: string | null;
refCommandName?: string | null;
positionCee?: string | null;
commandCode?: string | null;
commandName?: string | null;
}
export class UpdateProfileSalaryHistory {
@ -265,14 +262,14 @@ export class UpdateProfileSalaryHistory {
positionType?: string | null;
positionLevel?: string | null;
refCommandNo?: string | null;
templateDoc?: string | null;
remark?: string | null;
orgRoot?: string | null;
orgChild1?: string | null;
orgChild2?: string | null;
orgChild3?: string | null;
orgChild4?: string | null;
mpCee?: string | null;
refCommandCode?: string | null;
refCommandName?: string | null;
positionCee?: string | null;
commandCode?: string | null;
commandName?: string | null;
}

110
src/entities/HR_POSITION_OFFICER.ts → src/entities/positionOfficer.ts
View file

@ -1,13 +1,7 @@
import { Entity, Column, PrimaryGeneratedColumn } from "typeorm";
@Entity("HR_POSITION_OFFICER")
export class HR_POSITION_OFFICER {
@Column({
nullable: true,
type: "text",
default: null,
})
CIT: string;
@Entity("positionOfficer")
export class positionOfficer {
@PrimaryGeneratedColumn()
id!: number;
@ -16,173 +10,175 @@ export class HR_POSITION_OFFICER {
type: "text",
default: null,
})
FLAG_PERSON_TYPE: string;
citizenId: string;
@Column({
nullable: true,
type: "text",
default: null,
})
MP_POS_DATE: string;
flag_person_type: string;
@Column({
nullable: true,
type: "text",
default: null,
})
SALARY: string;
order_move_position: number;
@Column({
nullable: true,
type: "text",
default: null,
})
MP_COMMAND_NUM: string;
pos_num_code_sit: string;
@Column({
nullable: true,
type: "text",
default: null,
})
POS_NUM_NAME: string;
pos_num_code_sit_abb: string;
@Column({
nullable: true,
default: null,
})
mp_command_num: number;
@Column({
nullable: true,
default: null,
})
cur_year: number;
@Column({
nullable: true,
default: null,
})
mp_command_date: Date;
@Column({
nullable: true,
default: null,
})
mp_pos_date: Date;
@Column({
nullable: true,
type: "text",
default: null,
})
POS_NUM_CODE: string;
flag_to_name_code: string;
@Column({
nullable: true,
type: "text",
default: null,
})
FLAG_TO_NAME: string;
flag_to_name: string;
@Column({
nullable: true,
type: "text",
default: null,
})
WORK_LINE_NAME: string;
pos_num_name: string;
@Column({
nullable: true,
type: "text",
default: null,
})
SPECIALIST_NAME: string;
pos_num_code: string;
@Column({
nullable: true,
type: "text",
default: null,
})
ADMIN_NAME: string;
work_line_name: string;
@Column({
nullable: true,
type: "text",
default: null,
})
REMARK: string;
mp_cee: string;
@Column({
nullable: true,
type: "text",
default: null,
})
ORDER_MOVE_POSITION: string;
job_name: string;
@Column({
nullable: true,
type: "text",
default: null,
})
MP_COMMAND_DATE: string;
section_name: string;
@Column({
nullable: true,
type: "text",
default: null,
})
FLAG_TO_NAME_CODE: string;
division_name: string;
@Column({
nullable: true,
type: "text",
default: null,
})
JOB_NAME: string;
department_code: string;
@Column({
nullable: true,
type: "text",
default: null,
})
SECTION_NAME: string;
department_name: string;
@Column({
nullable: true,
type: "text",
default: null,
})
DIVISION_NAME: string;
admin_name: string;
@Column({
nullable: true,
default: null,
})
salary: number;
@Column({
nullable: true,
type: "text",
default: null,
})
DEPARTMENT_NAME: string;
remark: string;
@Column({
nullable: true,
type: "text",
default: null,
})
DEPARTMENT_CODE: string;
sal_pos_amount_1: string;
@Column({
nullable: true,
type: "text",
default: null,
})
MP_CEE: string;
sal_pos_amount_2: string;
@Column({
nullable: true,
type: "text",
default: null,
})
SAL_POS_AMOUNT_1: string;
@Column({
nullable: true,
type: "text",
default: null,
})
SAL_POS_AMOUNT_2: string;
@Column({
nullable: true,
type: "text",
default: null,
})
SPECIAL_AMT: string;
@Column({
nullable: true,
type: "text",
default: null,
})
USER_CREATE: string;
@Column({
nullable: true,
type: "text",
default: null,
})
USER_UPDATE: string;
special_amt: string;
}