no message

This commit is contained in:
kittapath 2024-10-09 16:20:43 +07:00
parent 428ed28b64
commit 7b83f91d73
7 changed files with 185 additions and 36 deletions

View file

@ -121,6 +121,7 @@ export class CommandController extends Controller {
*/
@Get("list")
async GetResult(
@Request() request: RequestWithUser,
@Query("page") page: number = 1,
@Query("pageSize") pageSize: number = 10,
@Query() keyword: string = "",
@ -130,6 +131,9 @@ export class CommandController extends Controller {
) {
const [commands, total] = await this.commandRepository
.createQueryBuilder("command")
.andWhere("command.createdUserId = :createdUserId", {
createdUserId: request.user.sub,
})
.andWhere(
status != null && status != undefined && status != ""
? "command.status IN (:...status)"

View file

@ -4828,6 +4828,7 @@ export class ProfileController extends Controller {
const isProbation: boolean = true;
const [findProfile, total] = await AppDataSource.getRepository(Profile)
.createQueryBuilder("profile")
.leftJoinAndSelect("profile.profileSalary", "profileSalary")
.leftJoinAndSelect("profile.posLevel", "posLevel")
.leftJoinAndSelect("profile.posType", "posType")
.leftJoinAndSelect("profile.current_holders", "current_holders")
@ -4942,6 +4943,10 @@ export class ProfileController extends Controller {
lastName: item.lastName,
position: item.position,
idcard: item.citizenId,
refCommandNo:
item.profileSalary.sort((a, b) => b.order - a.order).length == 0
? null
: item.profileSalary.sort((a, b) => b.order - a.order)[0].refCommandNo,
posLevelName: item.posLevel == null ? null : item.posLevel.posLevelName,
posTypeName: item.posType == null ? null : item.posType.posTypeName,
posNo: posMaster == null ? null : `${posMaster.posMasterNo}${shortName}`,

View file

@ -7,6 +7,9 @@ import HttpSuccess from "../interfaces/http-success";
import { Workflow } from "../entities/Workflow";
import { State } from "../entities/State";
import { StateOperator } from "../entities/StateOperator";
import { StateOperatorUser } from "../entities/StateOperatorUser";
import CallAPI from "../interfaces/call-api";
import { Profile } from "../entities/Profile";
@Route("api/v1/org/workflow")
@Tags("AuthRole")
@ -15,6 +18,56 @@ export class WorkflowController extends Controller {
private workflowRepo = AppDataSource.getRepository(Workflow);
private stateRepo = AppDataSource.getRepository(State);
private stateOperatorRepo = AppDataSource.getRepository(StateOperator);
private stateOperatorUserRepo = AppDataSource.getRepository(StateOperatorUser);
private profileRepo = AppDataSource.getRepository(Profile);
@Post("check-workflow")
public async checkWorkflow(
@Request() req: RequestWithUser,
@Body()
body: {
sysName: string;
posLevelName: string;
posTypeName: string;
profiles: {
profile: string;
operator: string;
order: number;
}[];
},
) {
const workflow = await this.workflowRepo.findOne({
where: {
sysName: body.sysName,
posLevelName: body.posLevelName,
posTypeName: body.posTypeName,
},
relations: ["states"],
});
if (!workflow) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบกระบวนการนี้ได้");
await Promise.all(
body.profiles.map(async (item) => {
const operatoeUser = new StateOperatorUser();
operatoeUser.profile = item.profile;
operatoeUser.operator = item.operator.trim().toLocaleUpperCase();
operatoeUser.order = item.order;
operatoeUser.workflowId = workflow.id;
operatoeUser.createdUserId = req.user.sub;
operatoeUser.createdFullName = req.user.name;
operatoeUser.createdAt = new Date();
operatoeUser.lastUpdateUserId = req.user.sub;
operatoeUser.lastUpdateFullName = req.user.name;
operatoeUser.lastUpdatedAt = new Date();
await this.stateOperatorUserRepo.save(operatoeUser);
}),
);
return new HttpSuccess({
workflowId: workflow.id,
stateId: workflow.states.sort((a, b) => a.order - b.order)[0].id,
// stateName: workflow.states.sort((a, b) => a.order - b.order)[0].name,
// stateType: workflow.states.sort((a, b) => a.order - b.order)[0].type,
});
}
@Post("check-iscan")
public async checkIsCan(
@ -23,20 +76,29 @@ export class WorkflowController extends Controller {
body: {
workflowId: string;
stateId: string;
operator: string;
profile: string;
action: string;
},
) {
const stateOperatorUser = await this.stateOperatorUserRepo.findOne({
where: {
profile: body.profile,
workflowId: body.workflowId,
},
});
if (!stateOperatorUser)
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่สามารถดำเนินการกระบวนการนี้ได้");
const operator = await this.stateOperatorRepo.findOne({
where: {
operator: body.operator,
operator: stateOperatorUser.operator,
state: { id: body.stateId, workflow: { id: body.workflowId } },
},
});
if (!operator) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
let isCan = false;
switch (body.action) {
switch (body.action.trim().toLocaleUpperCase()) {
case "VIEW":
isCan = operator.canView;
case "UPDATE":
@ -63,32 +125,38 @@ export class WorkflowController extends Controller {
}
}
@Post("check-workflow")
public async checkWorkflow(
@Post("check-iscan-all")
public async checkIsCanAll(
@Request() req: RequestWithUser,
@Body()
body: {
sysName: string;
posLevelName: string;
posTypeName: string;
workflowId: string;
stateId: string;
},
) {
const workflow = await this.workflowRepo.findOne({
const profile = await this.profileRepo.findOne({
where: {
sysName: body.sysName,
posLevelName: body.posLevelName,
posTypeName: body.posTypeName,
keycloak: req.user.sub,
},
relations: ["states"],
});
if (!workflow) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
const stateOperatorUser = await this.stateOperatorUserRepo.findOne({
where: {
profile: profile.id,
workflowId: body.workflowId,
},
});
if (!stateOperatorUser)
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่สามารถดำเนินการกระบวนการนี้ได้");
return new HttpSuccess({
workflowId: workflow.id,
stateId: workflow.states.sort((a, b) => a.order - b.order)[0].id,
stateName: workflow.states.sort((a, b) => a.order - b.order)[0].name,
stateType: workflow.states.sort((a, b) => a.order - b.order)[0].type,
const operator = await this.stateOperatorRepo.findOne({
where: {
operator: stateOperatorUser.operator,
state: { id: body.stateId, workflow: { id: body.workflowId } },
},
});
if (!operator) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
return new HttpSuccess(operator);
}
@Post("state-next")
@ -103,6 +171,7 @@ export class WorkflowController extends Controller {
where: {
id: body.stateId,
},
relations: ["stateOperators", "workflow", "workflow.stateOperatorUsers"],
});
if (!state) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
const _state = await this.stateRepo.findOne({
@ -110,7 +179,43 @@ export class WorkflowController extends Controller {
order: state.order + 1,
workflowId: state.workflowId,
},
relations: ["stateOperators"],
});
//noti
let profileNow = state.workflow.stateOperatorUsers
.filter((x) => state.stateOperators.map((s) => s.operator).includes(x.operator))
.map((x) => x.profile);
await new CallAPI()
.PostData(req, "/placement/noti/profiles", {
subject: `รายการถูกส่ง`,
body: `รายการถูกส่ง`,
receiverUserId: profileNow,
payload: "", //แนบไฟล์
isSendMail: true,
isSendInbox: true,
receiveDate: new Date(),
})
.catch((error) => {
console.error("Error calling API:", error);
});
if (_state != null) {
let profileNext = state.workflow.stateOperatorUsers
.filter((x) => _state.stateOperators.map((s) => s.operator).includes(x.operator))
.map((x) => x.profile);
await new CallAPI()
.PostData(req, "/placement/noti/profiles", {
subject: `ได้รับรายการ`,
body: `ได้รับรายการ`,
receiverUserId: profileNext,
payload: "", //แนบไฟล์
isSendMail: true,
isSendInbox: true,
receiveDate: new Date(),
})
.catch((error) => {
console.error("Error calling API:", error);
});
}
return new HttpSuccess({
stateId: _state?.id || null,