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

add director

Browse source
This commit is contained in:
kittapath 2024-11-06 16:22:11 +07:00
parent fa420d10ab
commit 147cf17b38
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileController.ts
View file

@ -1369,7 +1369,7 @@ export class ProfileController extends Controller {
if (body.isDirector == true) { if (body.isDirector == true) {
condition = { condition = {
orgRootId: posMaster.orgRootId || "", orgRootId: posMaster.orgRootId || "",
isDirector: true, isDirectorChild: true,
}; };
} }
const [lists, total] = await AppDataSource.getRepository(viewDirectorActing) const [lists, total] = await AppDataSource.getRepository(viewDirectorActing)
@ -4263,7 +4263,7 @@ export class ProfileController extends Controller {
child4ShortName: child4 == null ? null : child4.orgChild4ShortName, child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
node: null, node: null,
nodeId: null, nodeId: null,
type: "EMPLOYEE", type: profile.employeeClass,
salary: salary:
profile && profile.profileSalarys.length > 0 ? profile.profileSalarys[0].amount : null, profile && profile.profileSalarys.length > 0 ? profile.profileSalarys[0].amount : null,
}; };

2
src/entities/CommandSendCC.ts
View file

@ -6,7 +6,7 @@ import { CommandSend } from "./CommandSend";
export class CommandSendCC extends EntityBase { export class CommandSendCC extends EntityBase {
@Column({ @Column({
nullable: true, nullable: true,
comment: "เพศ", comment: "ชื่อ",
length: 255, length: 255,
default: null, default: null,
}) })

5
src/entities/view/viewDirectorActing.ts
View file

@ -16,7 +16,8 @@ import { ViewColumn, ViewEntity } from "typeorm";
ELSE \`orgChild4Child\`.\`orgChild4ShortName\` ELSE \`orgChild4Child\`.\`orgChild4ShortName\`
END), END),
\`bma_ehr_organization_demo\`.\`posMaster\`.\`posMasterNo\`) AS \`posNo\`, \`bma_ehr_organization_demo\`.\`posMaster\`.\`posMasterNo\`) AS \`posNo\`,
\`posMasterChild\`.\`isDirector\` AS \`isDirector\`, \`posMasterChild\`.\`isDirector\` AS \`isDirectorChild\`,
\`posMaster\`.\`isDirector\` AS \`isDirector\`,
\`bma_ehr_organization_demo\`.\`posLevel\`.\`posLevelName\` AS \`posLevel\`, \`bma_ehr_organization_demo\`.\`posLevel\`.\`posLevelName\` AS \`posLevel\`,
\`bma_ehr_organization_demo\`.\`posType\`.\`posTypeName\` AS \`posType\`, \`bma_ehr_organization_demo\`.\`posType\`.\`posTypeName\` AS \`posType\`,
\`bma_ehr_organization_demo\`.\`posMaster\`.\`orgRootId\` AS \`orgRootId\`, \`bma_ehr_organization_demo\`.\`posMaster\`.\`orgRootId\` AS \`orgRootId\`,
@ -61,6 +62,8 @@ export class viewDirectorActing {
@ViewColumn() @ViewColumn()
isDirector: boolean; isDirector: boolean;
@ViewColumn() @ViewColumn()
isDirectorChild: boolean;
@ViewColumn()
orgRootId: string; orgRootId: string;
@ViewColumn() @ViewColumn()
actFullNameId: string; actFullNameId: string;