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

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source
This commit is contained in:
kittapath 2025-03-19 13:34:18 +07:00
commit 06fb09afa2
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/interfaces/utils.ts
View file

@ -548,15 +548,15 @@ export function commandTypePath(commandCode: string): string | null {
case "C-PM-32": case "C-PM-32":
return "/discipline/result/command32/report"; return "/discipline/result/command32/report";
case "C-PM-33": case "C-PM-33":
return "/salary/report/command/officer/report"; //SALARY return "/salary/report/command33/officer/report"; //SALARY
case "C-PM-34": case "C-PM-34":
return "/salary/report/command/officer/report"; //SALARY return "/salary/report/command34/officer/report"; //SALARY
case "C-PM-35": case "C-PM-35":
return "/salary/report/command/officer/report"; //SALARY return "/salary/report/command35/officer/report"; //SALARY
case "C-PM-36": case "C-PM-36":
return "/salary/report/command/employee/report"; //SALARY return "/salary/report/command36/employee/report"; //SALARY
case "C-PM-37": case "C-PM-37":
return "/salary/report/command/employee/report"; //SALARY return "/salary/report/command37/employee/report"; //SALARY
case "C-PM-38": case "C-PM-38":
return "/org/command/command38/officer/report"; //ORG return "/org/command/command38/officer/report"; //ORG
case "C-PM-39": case "C-PM-39":

23
src/services/rabbitmq.ts
View file

@ -1711,17 +1711,20 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
}); });
// await posMasterRepository.remove(_posMasters); // await posMasterRepository.remove(_posMasters);
const batchSize = 1000; const batchSize = 1000;
for (let i = 0; i < _posMasters.length; i += batchSize) { const removeInBatches = async (repository:any, data:any, label:any) => {
const batch = _posMasters.slice(i, i + batchSize); for (let i = 0; i < data.length; i += batchSize) {
try { const batch = data.slice(i, i + batchSize);
await posMasterRepository.remove(batch); try {
console.log(`Removed PosMaster batch ${i / batchSize + 1}`); await repository.remove(batch);
} catch (error) { console.log(`Removed ${label} batch ${i / batchSize + 1}`);
console.log(`Failed to remove batch ${i / batchSize + 1}`); } catch (error) {
console.log(`Failed to remove ${label} batch ${i / batchSize + 1}`);
}
} }
} };
await employeePosMasterRepository.remove(_employeePosMasters); await removeInBatches(posMasterRepository, _posMasters, "PosMaster");
await employeeTempPosMasterRepository.remove(_employeeTempPosMasters); await removeInBatches(employeePosMasterRepository, _employeePosMasters, "EmployeePosMaster");
await removeInBatches(employeeTempPosMasterRepository, _employeeTempPosMasters, "EmployeeTempPosMaster");
await child4Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); await child4Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) });
await child3Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); await child3Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) });
await child2Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) }); await child2Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) });