update field
This commit is contained in:
parent
926bbc1fda
commit
be840b4a9c
3 changed files with 54 additions and 0 deletions
|
|
@ -2941,6 +2941,8 @@ export class CommandController extends Controller {
|
||||||
positionSalaryAmount?: Double | null;
|
positionSalaryAmount?: Double | null;
|
||||||
mouthSalaryAmount?: Double | null;
|
mouthSalaryAmount?: Double | null;
|
||||||
positionExecutive: string | null;
|
positionExecutive: string | null;
|
||||||
|
positionExecutiveField?: string | null;
|
||||||
|
positionArea?: string | null;
|
||||||
positionType: string | null;
|
positionType: string | null;
|
||||||
positionLevel: string | null;
|
positionLevel: string | null;
|
||||||
posmasterId: string;
|
posmasterId: string;
|
||||||
|
|
@ -3771,6 +3773,8 @@ export class CommandController extends Controller {
|
||||||
positionSalaryAmount?: Double | null;
|
positionSalaryAmount?: Double | null;
|
||||||
mouthSalaryAmount?: Double | null;
|
mouthSalaryAmount?: Double | null;
|
||||||
positionExecutive: string | null;
|
positionExecutive: string | null;
|
||||||
|
positionExecutiveField?: string | null;
|
||||||
|
positionArea?: string | null;
|
||||||
positionType: string | null;
|
positionType: string | null;
|
||||||
positionLevel: string | null;
|
positionLevel: string | null;
|
||||||
commandId?: string | null;
|
commandId?: string | null;
|
||||||
|
|
|
||||||
|
|
@ -6847,6 +6847,14 @@ export class ProfileController extends Controller {
|
||||||
position == null || position.posExecutive == null
|
position == null || position.posExecutive == null
|
||||||
? null
|
? null
|
||||||
: position.posExecutive.posExecutiveName,
|
: position.posExecutive.posExecutiveName,
|
||||||
|
positionExecutiveField:
|
||||||
|
position == null || position.positionExecutiveField == null
|
||||||
|
? null
|
||||||
|
: position.positionExecutiveField,
|
||||||
|
positionArea:
|
||||||
|
position == null || position.positionArea == null
|
||||||
|
? null
|
||||||
|
: position.positionArea,
|
||||||
posExecutivePriority:
|
posExecutivePriority:
|
||||||
position == null || position.posExecutive == null
|
position == null || position.posExecutive == null
|
||||||
? null
|
? null
|
||||||
|
|
@ -7005,6 +7013,14 @@ export class ProfileController extends Controller {
|
||||||
position == null || position.posExecutive == null
|
position == null || position.posExecutive == null
|
||||||
? null
|
? null
|
||||||
: position.posExecutive.posExecutiveName,
|
: position.posExecutive.posExecutiveName,
|
||||||
|
positionExecutiveField:
|
||||||
|
position == null || position.positionExecutiveField == null
|
||||||
|
? null
|
||||||
|
: position.positionExecutiveField,
|
||||||
|
positionArea:
|
||||||
|
position == null || position.positionArea == null
|
||||||
|
? null
|
||||||
|
: position.positionArea,
|
||||||
posExecutivePriority:
|
posExecutivePriority:
|
||||||
position == null || position.posExecutive == null
|
position == null || position.posExecutive == null
|
||||||
? null
|
? null
|
||||||
|
|
@ -7811,6 +7827,14 @@ export class ProfileController extends Controller {
|
||||||
position == null || position.posExecutive == null
|
position == null || position.posExecutive == null
|
||||||
? null
|
? null
|
||||||
: position.posExecutive.posExecutiveName,
|
: position.posExecutive.posExecutiveName,
|
||||||
|
positionExecutiveField:
|
||||||
|
position == null || position.positionExecutiveField == null
|
||||||
|
? null
|
||||||
|
: position.positionExecutiveField,
|
||||||
|
positionArea:
|
||||||
|
position == null || position.positionArea == null
|
||||||
|
? null
|
||||||
|
: position.positionArea,
|
||||||
rootId: root == null ? null : root.id,
|
rootId: root == null ? null : root.id,
|
||||||
rootDnaId: root == null ? null : root.ancestorDNA,
|
rootDnaId: root == null ? null : root.ancestorDNA,
|
||||||
root: root == null ? null : root.orgRootName,
|
root: root == null ? null : root.orgRootName,
|
||||||
|
|
@ -8003,6 +8027,14 @@ export class ProfileController extends Controller {
|
||||||
position == null || position.posExecutive == null
|
position == null || position.posExecutive == null
|
||||||
? null
|
? null
|
||||||
: position.posExecutive.posExecutiveName,
|
: position.posExecutive.posExecutiveName,
|
||||||
|
positionExecutiveField:
|
||||||
|
position == null || position.positionExecutiveField == null
|
||||||
|
? null
|
||||||
|
: position.positionExecutiveField,
|
||||||
|
positionArea:
|
||||||
|
position == null || position.positionArea == null
|
||||||
|
? null
|
||||||
|
: position.positionArea,
|
||||||
orgRevisionId: root == null ? null : root.orgRevisionId,
|
orgRevisionId: root == null ? null : root.orgRevisionId,
|
||||||
rootId: root == null ? null : root.id,
|
rootId: root == null ? null : root.id,
|
||||||
rootDnaId: root == null ? null : root.ancestorDNA,
|
rootDnaId: root == null ? null : root.ancestorDNA,
|
||||||
|
|
|
||||||
|
|
@ -271,6 +271,22 @@ export class ProfileSalary extends EntityBase {
|
||||||
})
|
})
|
||||||
posNumCodeSitAbb: string;
|
posNumCodeSitAbb: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
length: 255,
|
||||||
|
comment: "ด้านทางการบริหาร",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
positionExecutiveField: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
length: 255,
|
||||||
|
comment: "ด้าน/สาขา",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
positionArea: string;
|
||||||
|
|
||||||
@ManyToOne(() => Command, (command) => command.profileSalarys)
|
@ManyToOne(() => Command, (command) => command.profileSalarys)
|
||||||
@JoinColumn({ name: "commandId" })
|
@JoinColumn({ name: "commandId" })
|
||||||
command: Command;
|
command: Command;
|
||||||
|
|
@ -305,6 +321,8 @@ export class CreateProfileSalary {
|
||||||
positionLine?: string | null;
|
positionLine?: string | null;
|
||||||
positionPathSide?: string | null;
|
positionPathSide?: string | null;
|
||||||
positionExecutive?: string | null;
|
positionExecutive?: string | null;
|
||||||
|
positionExecutiveField?: string | null;
|
||||||
|
positionArea?: string | null;
|
||||||
amount?: Double | null;
|
amount?: Double | null;
|
||||||
amountSpecial?: Double | null;
|
amountSpecial?: Double | null;
|
||||||
positionSalaryAmount?: Double | null;
|
positionSalaryAmount?: Double | null;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue