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

ย้าตำแหน่งไม่คำนวนเลขตำแหน่งใหม่

Browse source
This commit is contained in:
Kittapath 2024-04-09 13:08:15 +07:00
parent 013ccf60e6
commit ea70cebc49
2 changed files with 264 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/EmployeePositionController.ts
View file

@ -1433,10 +1433,11 @@ export class EmployeePositionController extends Controller {
...type4LastPosMasterNo,
];
let maxPosMasterNo = Math.max(...allLastPosMasterNo.map((pos) => pos.posMasterNo), 0);
// let maxPosMasterNo = Math.max(...allLastPosMasterNo.map((pos) => pos.posMasterNo), 0);
let maxPosMasterOrder = Math.max(...allLastPosMasterNo.map((pos) => pos.posMasterOrder), 0);
posMasters.forEach(async (posMaster: any) => {
await Promise.all(
posMasters.map(async (posMaster: any) => {
let change = true;
if (requestBody.type == 0) {
@ -1568,7 +1569,6 @@ export class EmployeePositionController extends Controller {
}
}
if (change == true) {
// posMaster.posMasterNo = maxPosMasterNo += 1;
posMaster.posMasterOrder = maxPosMasterOrder += 1;
posMaster.createdUserId = request.user.sub;
posMaster.createdFullName = request.user.name;
@ -1576,7 +1576,8 @@ export class EmployeePositionController extends Controller {
posMaster.lastUpdateFullName = request.user.name;
await this.employeePosMasterRepository.save(posMaster);
}
});
}),
);
return new HttpSuccess();
}

7
src/controllers/PositionController.ts
View file

@ -1621,7 +1621,8 @@ export class PositionController extends Controller {
// let maxPosMasterNo = Math.max(...allLastPosMasterNo.map((pos) => pos.posMasterNo), 0);
let maxPosMasterOrder = Math.max(...allLastPosMasterNo.map((pos) => pos.posMasterOrder), 0);
posMasters.forEach(async (posMaster: any) => {
await Promise.all(
posMasters.map(async (posMaster: any) => {
let change = true;
if (requestBody.type == 0) {
@ -1743,6 +1744,7 @@ export class PositionController extends Controller {
HttpStatusCode.NOT_FOUND,
`เลขที่ตำแหน่ง ${org.orgChild4ShortName}${posMaster.posMasterNo} มีอยู่ในระบบอยู่แล้ว`,
);
if (posMaster.orgChild4Id == org.id) change = false;
posMaster.orgRootId = org.orgRootId;
posMaster.orgChild1Id = org.orgChild1Id;
@ -1760,7 +1762,8 @@ export class PositionController extends Controller {
posMaster.lastUpdateFullName = request.user.name;
await this.posMasterRepository.save(posMaster);
}
});
}),
);
return new HttpSuccess();
}