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

no message

Browse source
This commit is contained in:
Kittapath 2024-04-25 14:38:42 +07:00
parent 9e749fbbcd
commit b2319419c1
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/controllers/ReportController.ts
View file

@ -6300,6 +6300,7 @@ export class ReportController extends Controller {
const salaryRank = await this.salaryProfileRepository.find({
where: {
salaryOrgId: In(salaryOrgs.map((x) => x.id)),
type: In(["FULLHAFT", "FULL", "HAFT"]),
},
});
@ -6334,9 +6335,16 @@ export class ReportController extends Controller {
});
const salaryRank = await this.salaryProfileRepository.find({
where: {
salaryOrgId: In(salaryOrgs.map((x) => x.id)),
},
where: [
{
salaryOrgId: In(salaryOrgs.map((x) => x.id)),
amountSpecial: MoreThan(0),
},
{
salaryOrgId: In(salaryOrgs.map((x) => x.id)),
type: "NONE",
},
],
});
const _salaryRank = salaryRank.map((item) => ({
@ -6372,6 +6380,8 @@ export class ReportController extends Controller {
const salaryRank = await this.salaryProfileRepository.find({
where: {
salaryOrgId: In(salaryOrgs.map((x) => x.id)),
type: In(["FULLHAFT", "FULL", "HAFT"]),
isRetired: true,
},
});
@ -6401,13 +6411,14 @@ export class ReportController extends Controller {
if (!salary) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการขึ้นเงินเดือน");
}
const salaryOrgs = await this.salaryOrgRepository.find({
const salaryOrgs = await this.salaryOrgEmployeeRepository.find({
where: { id: salary.id },
});
const salaryRank = await this.salaryProfileRepository.find({
const salaryRank = await this.salaryProfileEmployeeRepository.find({
where: {
salaryOrgId: In(salaryOrgs.map((x) => x.id)),
type: In(["FULLHAFT", "FULL", "HAFT"]),
},
});
@ -6437,13 +6448,14 @@ export class ReportController extends Controller {
if (!salary) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลการขึ้นเงินเดือน");
}
const salaryOrgs = await this.salaryOrgRepository.find({
const salaryOrgs = await this.salaryOrgEmployeeRepository.find({
where: { id: salary.id },
});
const salaryRank = await this.salaryProfileRepository.find({
const salaryRank = await this.salaryProfileEmployeeRepository.find({
where: {
salaryOrgId: In(salaryOrgs.map((x) => x.id)),
amountSpecial: MoreThan(0),
},
});