Merge branch 'develop' into adiDev
This commit is contained in:
commit
2986803b35
1 changed files with 10 additions and 6 deletions
|
|
@ -7627,6 +7627,7 @@ export class ReportController extends Controller {
|
||||||
@Body()
|
@Body()
|
||||||
body: {
|
body: {
|
||||||
refIds: string[];
|
refIds: string[];
|
||||||
|
status: string;
|
||||||
},
|
},
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser,
|
||||||
) {
|
) {
|
||||||
|
|
@ -7635,7 +7636,7 @@ export class ReportController extends Controller {
|
||||||
});
|
});
|
||||||
const data = salaryProfile.map((_data) => ({
|
const data = salaryProfile.map((_data) => ({
|
||||||
..._data,
|
..._data,
|
||||||
status33: "REPORT",
|
status33: body.status.trim().toUpperCase(),
|
||||||
}));
|
}));
|
||||||
await this.salaryProfileRepository.save(data);
|
await this.salaryProfileRepository.save(data);
|
||||||
return new HttpSuccess();
|
return new HttpSuccess();
|
||||||
|
|
@ -7653,6 +7654,7 @@ export class ReportController extends Controller {
|
||||||
@Body()
|
@Body()
|
||||||
body: {
|
body: {
|
||||||
refIds: string[];
|
refIds: string[];
|
||||||
|
status: string;
|
||||||
},
|
},
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser,
|
||||||
) {
|
) {
|
||||||
|
|
@ -7661,7 +7663,7 @@ export class ReportController extends Controller {
|
||||||
});
|
});
|
||||||
const data = salaryProfile.map((_data) => ({
|
const data = salaryProfile.map((_data) => ({
|
||||||
..._data,
|
..._data,
|
||||||
status34: "REPORT",
|
status34: body.status.trim().toUpperCase(),
|
||||||
}));
|
}));
|
||||||
await this.salaryProfileRepository.save(data);
|
await this.salaryProfileRepository.save(data);
|
||||||
return new HttpSuccess();
|
return new HttpSuccess();
|
||||||
|
|
@ -7679,6 +7681,7 @@ export class ReportController extends Controller {
|
||||||
@Body()
|
@Body()
|
||||||
body: {
|
body: {
|
||||||
refIds: string[];
|
refIds: string[];
|
||||||
|
status: string;
|
||||||
},
|
},
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser,
|
||||||
) {
|
) {
|
||||||
|
|
@ -7687,7 +7690,7 @@ export class ReportController extends Controller {
|
||||||
});
|
});
|
||||||
const data = salaryProfile.map((_data) => ({
|
const data = salaryProfile.map((_data) => ({
|
||||||
..._data,
|
..._data,
|
||||||
status35: "REPORT",
|
status35: body.status.trim().toUpperCase(),
|
||||||
}));
|
}));
|
||||||
await this.salaryProfileRepository.save(data);
|
await this.salaryProfileRepository.save(data);
|
||||||
return new HttpSuccess();
|
return new HttpSuccess();
|
||||||
|
|
@ -7706,6 +7709,7 @@ export class ReportController extends Controller {
|
||||||
@Body()
|
@Body()
|
||||||
body: {
|
body: {
|
||||||
refIds: string[];
|
refIds: string[];
|
||||||
|
status: string;
|
||||||
},
|
},
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser,
|
||||||
) {
|
) {
|
||||||
|
|
@ -7714,7 +7718,7 @@ export class ReportController extends Controller {
|
||||||
});
|
});
|
||||||
const data = salaryProfile.map((_data) => ({
|
const data = salaryProfile.map((_data) => ({
|
||||||
..._data,
|
..._data,
|
||||||
status36: "REPORT",
|
status36: body.status.trim().toUpperCase(),
|
||||||
}));
|
}));
|
||||||
await this.salaryProfileEmployeeRepository.save(data);
|
await this.salaryProfileEmployeeRepository.save(data);
|
||||||
return new HttpSuccess();
|
return new HttpSuccess();
|
||||||
|
|
@ -7733,6 +7737,7 @@ export class ReportController extends Controller {
|
||||||
@Body()
|
@Body()
|
||||||
body: {
|
body: {
|
||||||
refIds: string[];
|
refIds: string[];
|
||||||
|
status: string;
|
||||||
},
|
},
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser,
|
||||||
) {
|
) {
|
||||||
|
|
@ -7741,7 +7746,7 @@ export class ReportController extends Controller {
|
||||||
});
|
});
|
||||||
const data = salaryProfile.map((_data) => ({
|
const data = salaryProfile.map((_data) => ({
|
||||||
..._data,
|
..._data,
|
||||||
status37: "REPORT",
|
status37: body.status.trim().toUpperCase(),
|
||||||
}));
|
}));
|
||||||
await this.salaryProfileEmployeeRepository.save(data);
|
await this.salaryProfileEmployeeRepository.save(data);
|
||||||
return new HttpSuccess();
|
return new HttpSuccess();
|
||||||
|
|
@ -8938,5 +8943,4 @@ export class ReportController extends Controller {
|
||||||
await this.salaryProfileEmployeeRepository.save(data);
|
await this.salaryProfileEmployeeRepository.save(data);
|
||||||
return new HttpSuccess();
|
return new HttpSuccess();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue