fix: แก้ รับ date null

This commit is contained in:
Net 2024-03-18 17:45:44 +07:00
parent b7b7e1bbd8
commit 5b2c56cb78
3 changed files with 53 additions and 92 deletions

View file

@ -259,7 +259,7 @@ export class ProfileLeave extends EntityBase {
}) })
typeLeaveId: string; typeLeaveId: string;
@Column({ @Column({
nullable: true, nullable: true,
comment: "เหตุผล", comment: "เหตุผล",
type: "text", type: "text",
@ -276,104 +276,73 @@ export class ProfileLeave extends EntityBase {
} }
export class CreateProfileLeave { export class CreateProfileLeave {
@Column("uuid")
profileId: string | null; profileId: string | null;
@Column()
isActive: boolean; isActive: boolean;
@Column()
restCount: number | null; restCount: number | null;
@Column()
restDay: number | null; restDay: number | null;
@Column()
sickCount: number | null; sickCount: number | null;
@Column()
sickDay: number | null; sickDay: number | null;
@Column()
otherDay: number | null; otherDay: number | null;
@Column()
personalCount: number | null; personalCount: number | null;
@Column()
personalDay: number | null; personalDay: number | null;
@Column()
studyCount: number | null; studyCount: number | null;
@Column()
absentCount: number | null; absentCount: number | null;
@Column()
absentDay: number | null; absentDay: number | null;
@Column()
agencyCount: number | null; agencyCount: number | null;
agencyDay: number | null;
@Column()
agencyDay: number | null;
@Column()
coupleCount: number | null; coupleCount: number | null;
@Column()
coupleDay: number | null; coupleDay: number | null;
@Column()
lateCount: number | null; lateCount: number | null;
@Column()
lateDay: number | null; lateDay: number | null;
@Column()
maternityCount: number | null; maternityCount: number | null;
@Column()
maternityDay: number | null; maternityDay: number | null;
@Column()
militaryCount: number | null; militaryCount: number | null;
@Column()
militaryDay: number | null; militaryDay: number | null;
@Column()
ordainCount: number | null; ordainCount: number | null;
@Column()
ordainDay: number | null; ordainDay: number | null;
@Column()
otherCount: number | null; otherCount: number | null;
@Column()
dateStartLeave: Date | null; dateStartLeave: Date | null;
@Column()
dateEndLeave: Date | null; dateEndLeave: Date | null;
@Column()
numLeave: number | null; numLeave: number | null;
@Column()
sumLeave: number | null; sumLeave: number | null;
@Column()
totalLeave: number | null; totalLeave: number | null;
@Column()
status: string | null; status: string | null;
@Column("uuid")
typeLeaveId: string | null; typeLeaveId: string | null;
@Column()
reason: string | null; reason: string | null;
} }
export type UpdateProfileLeave = Partial<CreateProfileLeave>; export type UpdateProfileLeave = {
profileId: string | null;
isActive: boolean;
restCount: number | null;
restDay: number | null;
sickCount: number | null;
sickDay: number | null;
otherDay: number | null;
personalCount: number | null;
personalDay: number | null;
studyCount: number | null;
absentCount: number | null;
absentDay: number | null;
agencyCount: number | null;
agencyDay: number | null;
coupleCount: number | null;
coupleDay: number | null;
lateCount: number | null;
lateDay: number | null;
maternityCount: number | null;
maternityDay: number | null;
militaryCount: number | null;
militaryDay: number | null;
ordainCount: number | null;
ordainDay: number | null;
otherCount: number | null;
dateStartLeave?: Date | null;
dateEndLeave?: Date | null;
numLeave: number | null;
sumLeave: number | null;
totalLeave: number | null;
status: string | null;
typeLeaveId: string | null;
reason: string | null;
};

View file

@ -68,27 +68,21 @@ export class ProfileNopaid extends EntityBase {
} }
export class CreateProfileNopaid { export class CreateProfileNopaid {
@Column("uuid")
profileId: string | null; profileId: string | null;
@Column()
isActive: boolean; isActive: boolean;
@Column()
date: Date | null; date: Date | null;
@Column()
detail: string | null; detail: string | null;
@Column()
reference: string | null; reference: string | null;
@Column()
refCommandDate: Date | null; refCommandDate: Date | null;
@Column()
refCommandNo: string | null; refCommandNo: string | null;
} }
export type UpdateProfileNopaid = Partial<CreateProfileNopaid>; export type UpdateProfileNopaid = {
profileId: string | null;
isActive: boolean;
date?: Date | null;
detail: string | null;
reference: string | null;
refCommandDate?: Date | null;
refCommandNo: string | null;
};

View file

@ -18,7 +18,7 @@ export class ProfileOther extends EntityBase {
default: false, default: false,
}) })
isActive: boolean; isActive: boolean;
@Column({ @Column({
nullable: true, nullable: true,
comment: "รายละเอียด", comment: "รายละเอียด",
@ -44,17 +44,15 @@ export class ProfileOther extends EntityBase {
} }
export class CreateProfileOther { export class CreateProfileOther {
@Column("uuid")
profileId: string | null; profileId: string | null;
@Column()
isActive: boolean; isActive: boolean;
@Column()
detail: string | null; detail: string | null;
@Column()
date: Date | null; date: Date | null;
} }
export type UpdateProfileOther = Partial<CreateProfileOther>; export type UpdateProfileOther = {
profileId: string | null;
isActive: boolean;
detail: string | null;
date?: Date | null;
};