hrms-bangkok/hrms-api-development
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-07-30 17:23:45 +07:00
parent f027422d56
commit 293d41b0f2
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/controllers/DevelopmentController.ts
View file

@ -2388,9 +2388,9 @@ export class DevelopmentController extends Controller {
throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "ข้อมูลนี้ได้ถูกบันทึกแล้ว"); throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "ข้อมูลนี้ได้ถูกบันทึกแล้ว");
oldProfile.dateStart = requestBody.dateStart == undefined ? _null : requestBody.dateStart; oldProfile.dateStart = requestBody.dateStart == undefined ? _null : requestBody.dateStart;
oldProfile.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd; oldProfile.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
oldProfile.order = requestBody.order == undefined ? _null : requestBody.order; oldProfile.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
oldProfile.dateOrder = oldProfile.dateOrder =
requestBody.dateOrder == undefined ? _null : new Date(requestBody.dateOrder); requestBody.commandDate == undefined ? _null : new Date(requestBody.commandDate);
oldProfile.trainingDays = oldProfile.trainingDays =
requestBody.trainingDays == undefined ? _null : requestBody.trainingDays; requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
oldProfile.createdUserId = request.user.sub; oldProfile.createdUserId = request.user.sub;
@ -2415,9 +2415,9 @@ export class DevelopmentController extends Controller {
development.dateStart = development.dateStart =
requestBody.dateStart == undefined ? _null : requestBody.dateStart; requestBody.dateStart == undefined ? _null : requestBody.dateStart;
development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd; development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
development.order = requestBody.order == undefined ? _null : requestBody.order; development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
development.dateOrder = development.dateOrder =
requestBody.dateOrder == undefined ? _null : requestBody.dateOrder; requestBody.commandDate == undefined ? _null : requestBody.commandDate;
development.trainingDays = development.trainingDays =
requestBody.trainingDays == undefined ? _null : requestBody.trainingDays; requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
development.posLevelId = x.posLevelId == undefined ? _null : x.posLevelId; development.posLevelId = x.posLevelId == undefined ? _null : x.posLevelId;
@ -2451,9 +2451,9 @@ export class DevelopmentController extends Controller {
development.dateStart = development.dateStart =
requestBody.dateStart == undefined ? _null : requestBody.dateStart; requestBody.dateStart == undefined ? _null : requestBody.dateStart;
development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd; development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
development.order = requestBody.order == undefined ? _null : requestBody.order; development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
development.dateOrder = development.dateOrder =
requestBody.dateOrder == undefined ? _null : requestBody.dateOrder; requestBody.commandDate == undefined ? _null : requestBody.commandDate;
development.trainingDays = development.trainingDays =
requestBody.trainingDays == undefined ? _null : requestBody.trainingDays; requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
development.posLevelId = x.posLevelId == undefined ? _null : x.posLevelId; development.posLevelId = x.posLevelId == undefined ? _null : x.posLevelId;
@ -2484,9 +2484,9 @@ export class DevelopmentController extends Controller {
development.dateStart = development.dateStart =
requestBody.dateStart == undefined ? _null : requestBody.dateStart; requestBody.dateStart == undefined ? _null : requestBody.dateStart;
development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd; development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
development.order = requestBody.order == undefined ? _null : requestBody.order; development.order = requestBody.commandNumber == undefined ? _null : requestBody.commandNumber;
development.dateOrder = development.dateOrder =
requestBody.dateOrder == undefined ? _null : requestBody.dateOrder; requestBody.commandDate == undefined ? _null : requestBody.commandDate;
development.trainingDays = development.trainingDays =
requestBody.trainingDays == undefined ? _null : requestBody.trainingDays; requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
development.posLevelId = null; development.posLevelId = null;
@ -2520,9 +2520,9 @@ export class DevelopmentController extends Controller {
development.dateStart = development.dateStart =
requestBody.dateStart == undefined ? _null : requestBody.dateStart; requestBody.dateStart == undefined ? _null : requestBody.dateStart;
development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd; development.dateEnd = requestBody.dateEnd == undefined ? _null : requestBody.dateEnd;
development.order = requestBody.order == undefined ? _null : requestBody.order; // development.order = requestBody.order == undefined ? _null : requestBody.order;
development.dateOrder = // development.dateOrder =
requestBody.dateOrder == undefined ? _null : requestBody.dateOrder; // requestBody.dateOrder == undefined ? _null : requestBody.dateOrder;
development.trainingDays = development.trainingDays =
requestBody.trainingDays == undefined ? _null : requestBody.trainingDays; requestBody.trainingDays == undefined ? _null : requestBody.trainingDays;
development.posLevelId = x.posLevelId; development.posLevelId = x.posLevelId;

18
src/entities/DevelopmentHistory.ts
View file

@ -285,8 +285,8 @@ export class UpdateDevelopmentHistory {
} }
export class CreateDevelopmentHistoryOBO { export class CreateDevelopmentHistoryOBO {
@Column() // @Column()
rank: string | null; // rank: string | null;
@Column() @Column()
prefix: string | null; prefix: string | null;
@Column() @Column()
@ -298,15 +298,17 @@ export class CreateDevelopmentHistoryOBO {
@Column() @Column()
position: string | null; position: string | null;
@Column() @Column()
posExecutive: string | null; posExecutive?: string | null;
@Column() @Column()
posLevelId: string | null; posLevelId?: string | null;
@Column() @Column()
posTypeId: string | null; posTypeId?: string | null;
// @Column()
// developmentId: string;
@Column() @Column()
developmentId: string; commandNumber: string | null;
@Column() @Column()
order: string | null; commandDate: Date | null;
@Column() @Column()
trainingDays: string | null; trainingDays: string | null;
@Column() @Column()
@ -314,8 +316,6 @@ export class CreateDevelopmentHistoryOBO {
@Column() @Column()
type: string | null; type: string | null;
@Column() @Column()
dateOrder: Date | null;
@Column()
dateStart: Date | null; dateStart: Date | null;
@Column() @Column()
dateEnd: Date | null; dateEnd: Date | null;