Merge branch 'develop' into develop-Bright
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m27s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m27s
This commit is contained in:
commit
4268f93ed3
2 changed files with 10 additions and 0 deletions
|
|
@ -679,6 +679,11 @@ export class EmployeePositionController extends Controller {
|
||||||
posMaster.lastUpdateFullName = request.user.name;
|
posMaster.lastUpdateFullName = request.user.name;
|
||||||
posMaster.lastUpdatedAt = new Date();
|
posMaster.lastUpdatedAt = new Date();
|
||||||
await this.employeePosMasterRepository.save(posMaster, { data: request });
|
await this.employeePosMasterRepository.save(posMaster, { data: request });
|
||||||
|
|
||||||
|
const saved = await this.employeePosMasterRepository.save(posMaster, { data: request });
|
||||||
|
saved.ancestorDNA = saved.id;
|
||||||
|
await this.employeePosMasterRepository.save(saved, { data: request });
|
||||||
|
|
||||||
setLogDataDiff(request, { before, after: posMaster });
|
setLogDataDiff(request, { before, after: posMaster });
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
requestBody.positions.map(async (x: any) => {
|
requestBody.positions.map(async (x: any) => {
|
||||||
|
|
|
||||||
|
|
@ -546,6 +546,11 @@ export class EmployeeTempPositionController extends Controller {
|
||||||
posMaster.lastUpdateFullName = request.user.name;
|
posMaster.lastUpdateFullName = request.user.name;
|
||||||
posMaster.lastUpdatedAt = new Date();
|
posMaster.lastUpdatedAt = new Date();
|
||||||
await this.employeeTempPosMasterRepository.save(posMaster, { data: request });
|
await this.employeeTempPosMasterRepository.save(posMaster, { data: request });
|
||||||
|
|
||||||
|
const saved = await this.employeeTempPosMasterRepository.save(posMaster, { data: request });
|
||||||
|
saved.ancestorDNA = saved.id;
|
||||||
|
await this.employeeTempPosMasterRepository.save(saved, { data: request });
|
||||||
|
|
||||||
setLogDataDiff(request, { before, after: posMaster });
|
setLogDataDiff(request, { before, after: posMaster });
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
requestBody.positions.map(async (x: any) => {
|
requestBody.positions.map(async (x: any) => {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue