search emp approve
This commit is contained in:
parent
5eb46baeeb
commit
cb1323eb1a
1 changed files with 38 additions and 15 deletions
|
|
@ -21,6 +21,7 @@ import { PosMasterAct } from "../entities/PosMasterAct";
|
||||||
import { viewDirectorActing } from "../entities/view/viewDirectorActing";
|
import { viewDirectorActing } from "../entities/view/viewDirectorActing";
|
||||||
import { viewDirector } from "../entities/view/viewDirector";
|
import { viewDirector } from "../entities/view/viewDirector";
|
||||||
import { ProfileEmployee } from "../entities/ProfileEmployee";
|
import { ProfileEmployee } from "../entities/ProfileEmployee";
|
||||||
|
import { EmployeePosMaster } from "../entities/EmployeePosMaster";
|
||||||
|
|
||||||
@Route("api/v1/org/workflow")
|
@Route("api/v1/org/workflow")
|
||||||
@Tags("Workflow")
|
@Tags("Workflow")
|
||||||
|
|
@ -38,6 +39,7 @@ export class WorkflowController extends Controller {
|
||||||
private metaStateRepo = AppDataSource.getRepository(MetaState);
|
private metaStateRepo = AppDataSource.getRepository(MetaState);
|
||||||
private metaStateOperatorRepo = AppDataSource.getRepository(MetaStateOperator);
|
private metaStateOperatorRepo = AppDataSource.getRepository(MetaStateOperator);
|
||||||
private posMasterRepo = AppDataSource.getRepository(PosMaster);
|
private posMasterRepo = AppDataSource.getRepository(PosMaster);
|
||||||
|
private posMasterEmpRepo = AppDataSource.getRepository(EmployeePosMaster);
|
||||||
private posMasterActRepo = AppDataSource.getRepository(PosMasterAct);
|
private posMasterActRepo = AppDataSource.getRepository(PosMasterAct);
|
||||||
private assignRepo = AppDataSource.getRepository(Assign);
|
private assignRepo = AppDataSource.getRepository(Assign);
|
||||||
|
|
||||||
|
|
@ -806,25 +808,46 @@ export class WorkflowController extends Controller {
|
||||||
page: number;
|
page: number;
|
||||||
pageSize: number;
|
pageSize: number;
|
||||||
keycloakId?: string | null;
|
keycloakId?: string | null;
|
||||||
|
type?: string | null;
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
let posMasterUser: PosMaster = new PosMaster();
|
let posMasterUser = null;
|
||||||
if (body.keycloakId) {
|
if (body.keycloakId) {
|
||||||
posMasterUser = (await this.posMasterRepo.findOne({
|
if (body.type == "employee") {
|
||||||
where: {
|
posMasterUser = await this.posMasterEmpRepo.findOne({
|
||||||
orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
where: {
|
||||||
current_holder: { keycloak: body.keycloakId },
|
orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
||||||
},
|
current_holder: { keycloak: body.keycloakId },
|
||||||
relations: ["current_holder", "current_holder.posType", "current_holder.posLevel"],
|
},
|
||||||
})) as PosMaster;
|
relations: ["current_holder", "current_holder.posType", "current_holder.posLevel"],
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
posMasterUser = await this.posMasterRepo.findOne({
|
||||||
|
where: {
|
||||||
|
orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
||||||
|
current_holder: { keycloak: body.keycloakId },
|
||||||
|
},
|
||||||
|
relations: ["current_holder", "current_holder.posType", "current_holder.posLevel"],
|
||||||
|
});
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
posMasterUser = (await this.posMasterRepo.findOne({
|
if (body.type == "employee") {
|
||||||
where: {
|
posMasterUser = await this.posMasterEmpRepo.findOne({
|
||||||
orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
where: {
|
||||||
current_holder: { keycloak: request.user.sub },
|
orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
||||||
},
|
current_holder: { keycloak: request.user.sub },
|
||||||
relations: ["current_holder", "current_holder.posType", "current_holder.posLevel"],
|
},
|
||||||
})) as PosMaster;
|
relations: ["current_holder", "current_holder.posType", "current_holder.posLevel"],
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
posMasterUser = await this.posMasterRepo.findOne({
|
||||||
|
where: {
|
||||||
|
orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
||||||
|
current_holder: { keycloak: request.user.sub },
|
||||||
|
},
|
||||||
|
relations: ["current_holder", "current_holder.posType", "current_holder.posLevel"],
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!posMasterUser || !posMasterUser.orgRootId)
|
if (!posMasterUser || !posMasterUser.orgRootId)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue