import edu
This commit is contained in:
parent
ce5a595bc6
commit
b314fe0cec
5 changed files with 58 additions and 14 deletions
|
|
@ -134,6 +134,7 @@ async function handler(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
}
|
||||
|
||||
async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
//----> condition before process consume
|
||||
const repoPosmaster = AppDataSource.getRepository(PosMaster);
|
||||
const repoEmployeePosmaster = AppDataSource.getRepository(EmployeePosMaster);
|
||||
|
|
@ -148,11 +149,13 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
const child3Repository = AppDataSource.getRepository(OrgChild3);
|
||||
const child4Repository = AppDataSource.getRepository(OrgChild4);
|
||||
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
const orgRevisionPublish = await repoOrgRevision
|
||||
.createQueryBuilder("orgRevision")
|
||||
.where("orgRevision.orgRevisionIsDraft = false")
|
||||
.andWhere("orgRevision.orgRevisionIsCurrent = true")
|
||||
.getOne();
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
|
||||
const orgRevisionDraft = await repoOrgRevision
|
||||
.createQueryBuilder("orgRevision")
|
||||
|
|
@ -164,14 +167,17 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
orgRevisionPublish.orgRevisionIsCurrent = false;
|
||||
await repoOrgRevision.save(orgRevisionPublish);
|
||||
}
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
if (orgRevisionDraft) {
|
||||
orgRevisionDraft.orgRevisionIsCurrent = true;
|
||||
orgRevisionDraft.orgRevisionIsDraft = false;
|
||||
await repoOrgRevision.save(orgRevisionDraft);
|
||||
}
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
|
||||
const { data, token, user } = JSON.parse(msg.content.toString());
|
||||
const { id, status, lastUpdateUserId, lastUpdateFullName, lastUpdatedAt } = data;
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
try {
|
||||
const posMaster = await repoPosmaster.find({
|
||||
where: { orgRevisionId: id },
|
||||
|
|
@ -187,7 +193,9 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
"positions.posExecutive",
|
||||
],
|
||||
});
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
for (const item of posMaster) {
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
if (item.next_holderId != null && status == "NOW") {
|
||||
const profile = await repoProfile.findOne({
|
||||
where: { id: item.next_holderId == null ? "" : item.next_holderId },
|
||||
|
|
@ -210,7 +218,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
}
|
||||
console.log(orgRevisionPublish);
|
||||
console.log("zzzzzzzzzzzzzzzz");
|
||||
if (orgRevisionPublish != null) {
|
||||
if (orgRevisionPublish != null && orgRevisionDraft !=null) {
|
||||
console.log("cccccccccccccccccccccc");
|
||||
//new main revision
|
||||
const before = null;
|
||||
|
|
@ -333,7 +341,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeePosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeePosMaster.current_holderId = null;
|
||||
employeePosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeePosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeePosMaster.orgRootId = dataId;
|
||||
employeePosMaster.createdUserId = "";
|
||||
employeePosMaster.createdFullName = "System Administrator";
|
||||
|
|
@ -393,7 +401,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeeTempPosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeeTempPosMaster.current_holderId = null;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeeTempPosMaster.orgRootId = dataId;
|
||||
employeeTempPosMaster.createdUserId = "";
|
||||
employeeTempPosMaster.createdFullName = "System Administrator";
|
||||
|
|
@ -466,7 +474,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeePosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeePosMaster.current_holderId = null;
|
||||
employeePosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeePosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeePosMaster.orgRootId = dataId;
|
||||
employeePosMaster.orgChild1Id = data1Id;
|
||||
employeePosMaster.createdUserId = "";
|
||||
|
|
@ -529,7 +537,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeeTempPosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeeTempPosMaster.current_holderId = null;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeeTempPosMaster.orgRootId = dataId;
|
||||
employeeTempPosMaster.orgChild1Id = data1Id;
|
||||
employeeTempPosMaster.createdUserId = "";
|
||||
|
|
@ -605,7 +613,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeePosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeePosMaster.current_holderId = null;
|
||||
employeePosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeePosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeePosMaster.orgRootId = dataId;
|
||||
employeePosMaster.orgChild1Id = data1Id;
|
||||
employeePosMaster.orgChild2Id = data2Id;
|
||||
|
|
@ -673,7 +681,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeeTempPosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeeTempPosMaster.current_holderId = null;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeeTempPosMaster.orgRootId = dataId;
|
||||
employeeTempPosMaster.orgChild1Id = data1Id;
|
||||
employeeTempPosMaster.orgChild2Id = data2Id;
|
||||
|
|
@ -751,7 +759,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeePosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeePosMaster.current_holderId = null;
|
||||
employeePosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeePosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeePosMaster.orgRootId = dataId;
|
||||
employeePosMaster.orgChild1Id = data1Id;
|
||||
employeePosMaster.orgChild2Id = data2Id;
|
||||
|
|
@ -820,7 +828,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeeTempPosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeeTempPosMaster.current_holderId = null;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeeTempPosMaster.orgRootId = dataId;
|
||||
employeeTempPosMaster.orgChild1Id = data1Id;
|
||||
employeeTempPosMaster.orgChild2Id = data2Id;
|
||||
|
|
@ -899,7 +907,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeePosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeePosMaster.current_holderId = null;
|
||||
employeePosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeePosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeePosMaster.orgRootId = dataId;
|
||||
employeePosMaster.orgChild1Id = data1Id;
|
||||
employeePosMaster.orgChild2Id = data2Id;
|
||||
|
|
@ -966,7 +974,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// employeeTempPosMaster.authRoleId = null;
|
||||
// }
|
||||
// employeeTempPosMaster.current_holderId = null;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionPublish.id;
|
||||
employeeTempPosMaster.orgRevisionId = orgRevisionDraft.id;
|
||||
employeeTempPosMaster.orgRootId = dataId;
|
||||
employeeTempPosMaster.orgChild1Id = data1Id;
|
||||
employeeTempPosMaster.orgChild2Id = data2Id;
|
||||
|
|
@ -1013,7 +1021,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
// }
|
||||
|
||||
const employeePosMaster = await repoEmployeePosmaster.find({
|
||||
where: { orgRevisionId: orgRevisionPublish.id },
|
||||
where: { orgRevisionId: orgRevisionDraft.id },
|
||||
relations: ["positions", "positions.posLevel", "positions.posType"],
|
||||
});
|
||||
for (const item of employeePosMaster) {
|
||||
|
|
@ -1038,7 +1046,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
|
|||
await repoEmployeePosmaster.save(item).catch((e) => console.log(e));
|
||||
}
|
||||
const employeeTempPosMaster = await repoEmployeeTempPosmaster.find({
|
||||
where: { orgRevisionId: orgRevisionPublish.id },
|
||||
where: { orgRevisionId: orgRevisionDraft.id },
|
||||
relations: ["positions", "positions.posLevel", "positions.posType"],
|
||||
});
|
||||
for (const item of employeeTempPosMaster) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue