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:
AdisakKanthawilang 2024-02-20 16:59:13 +07:00
parent a47f07110a
commit bb79b0a3d0
3 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/PositionController.ts
View file

@ -121,6 +121,7 @@ export class PositionController extends Controller {
posExecutiveId: String(posDict.posExecutiveId), posExecutiveId: String(posDict.posExecutiveId),
posDictExecutiveField: posDict.posDictExecutiveField, posDictExecutiveField: posDict.posDictExecutiveField,
posDictArea: posDict.posDictArea, posDictArea: posDict.posDictArea,
isSpacial: posDict.isSpacial
}, },
}); });
if (rowRepeated) { if (rowRepeated) {
@ -268,6 +269,7 @@ export class PositionController extends Controller {
posExecutiveName: item.posExecutive == null ? null : item.posExecutive.posExecutiveName, posExecutiveName: item.posExecutive == null ? null : item.posExecutive.posExecutiveName,
positionExecutiveField: item.posDictExecutiveField, positionExecutiveField: item.posDictExecutiveField,
positionArea: item.posDictArea, positionArea: item.posDictArea,
isSpacial: item.isSpacial,
positionIsSelected: false, positionIsSelected: false,
}; };
}), }),
@ -359,9 +361,7 @@ export class PositionController extends Controller {
const dataDup: any = await this.posMasterRepository.findOne({ const dataDup: any = await this.posMasterRepository.findOne({
where: { where: {
orgChild4Id: orgChild4.id, orgChild4Id: orgChild4.id,
posMasterNoPrefix: requestBody.posMasterNoPrefix,
posMasterNo: requestBody.posMasterNo, posMasterNo: requestBody.posMasterNo,
posMasterNoSuffix: requestBody.posMasterNoSuffix,
}, },
}); });
if (dataDup != null) if (dataDup != null)
@ -530,6 +530,7 @@ export class PositionController extends Controller {
position.posExecutiveId = x.posExecutiveId; position.posExecutiveId = x.posExecutiveId;
position.positionExecutiveField = x.posDictExecutiveField; position.positionExecutiveField = x.posDictExecutiveField;
position.positionArea = x.posDictArea; position.positionArea = x.posDictArea;
position.isSpacial = x.isSpacial;
position.positionIsSelected = false; position.positionIsSelected = false;
position.posMasterId = posMaster.id; position.posMasterId = posMaster.id;
position.createdUserId = request.user.sub; position.createdUserId = request.user.sub;
@ -746,6 +747,7 @@ export class PositionController extends Controller {
position.posExecutiveId = x.posExecutiveId; position.posExecutiveId = x.posExecutiveId;
position.positionExecutiveField = x.posDictExecutiveField; position.positionExecutiveField = x.posDictExecutiveField;
position.positionArea = x.posDictArea; position.positionArea = x.posDictArea;
position.isSpacial = x.isSpacial;
position.positionIsSelected = false; position.positionIsSelected = false;
position.posMasterId = posMaster.id; position.posMasterId = posMaster.id;
position.createdUserId = request.user.sub; position.createdUserId = request.user.sub;
@ -796,6 +798,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField, positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea, positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected, positionIsSelected: position.positionIsSelected,
isSpacial: position.isSpacial,
})), })),
}; };
return new HttpSuccess(formattedData); return new HttpSuccess(formattedData);
@ -1139,6 +1142,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField, positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea, positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected, positionIsSelected: position.positionIsSelected,
isSpacial: position.isSpacial,
})), })),
}; };
}), }),
@ -2282,6 +2286,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField, positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea, positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected, positionIsSelected: position.positionIsSelected,
isSpacial: position.isSpacial,
})), })),
}; };
}), }),

9
src/entities/PosDict.ts
View file

@ -58,6 +58,12 @@ export class PosDict extends EntityBase {
}) })
posDictArea: string; posDictArea: string;
@Column({
comment: "ฉ",
default: false,
})
isSpacial: boolean;
@ManyToOne(() => PosExecutive, (posExecutive) => posExecutive) @ManyToOne(() => PosExecutive, (posExecutive) => posExecutive)
@JoinColumn({ name: "posExecutiveId" }) @JoinColumn({ name: "posExecutiveId" })
posExecutive: PosExecutive; posExecutive: PosExecutive;
@ -92,6 +98,9 @@ export class CreatePosDict {
@Column() @Column()
posDictArea: string | null; posDictArea: string | null;
@Column()
isSpacial: boolean;
} }
export type UpdatePosDict = Partial<CreatePosDict>; export type UpdatePosDict = Partial<CreatePosDict>;

9
src/entities/Position.ts
View file

@ -71,6 +71,12 @@ export class Position extends EntityBase {
}) })
posMasterId: string; posMasterId: string;
@Column({
comment: "ฉ",
default: false,
})
isSpacial: boolean;
@ManyToOne(() => PosMaster, (posMaster) => posMaster) @ManyToOne(() => PosMaster, (posMaster) => posMaster)
@JoinColumn({ name: "posMasterId" }) @JoinColumn({ name: "posMasterId" })
posMaster: PosMaster; posMaster: PosMaster;
@ -108,6 +114,9 @@ export class CreatePosition {
@Column() @Column()
positionArea: string; positionArea: string;
@Column()
isSpacial: boolean;
} }
export type UpdatePosition = Partial<CreatePosition>; export type UpdatePosition = Partial<CreatePosition>;