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

#1451,#1452

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-28 10:48:58 +07:00
parent 2f0d86ed58
commit f456c0821b
3 changed files with 58 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/ReportController.ts
View file

@ -32,6 +32,7 @@ import { SalaryOrgEmployee } from "../entities/SalaryOrgEmployee";
import { SalaryProfileEmployee } from "../entities/SalaryProfileEmployee";
import { setLogDataDiff } from "../interfaces/utils";
import { RequestWithUser } from "../middlewares/user";
import permission from "../interfaces/permission";
import CallAPI from "../interfaces/call-api";
import { isNotEmittedStatement } from "typescript";
@ -7581,6 +7582,7 @@ export class ReportController extends Controller {
// }),
// )
.andWhere("salaryProfileEmployee.status36 = :status", { status: "PENDING" })
.andWhere("salaryProfileEmployee.rootId = :rootId", { rootId: body.rootId })
.select([
"salaryProfileEmployee.id",
"salaryProfileEmployee.orgShortName",
@ -8829,6 +8831,7 @@ export class ReportController extends Controller {
commandYear: v.commandYear,
commandId: v.commandId,
salaryLevel: salary.salaryLevel && salary.salaryLevelNew ? salary.salaryLevelNew : salary.salaryLevel,
group: salary.group && salary.groupNew ? salary.groupNew : salary.group,
})
.then(async () => {
const before = null;