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-03-08 14:54:24 +07:00
parent 07c310ae26
commit c41b0f008a
4 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/OrganizationUnauthorizeController.ts
View file

@ -69,6 +69,7 @@ export class OrganizationUnauthorizeController extends Controller {
.leftJoinAndSelect("posMaster.positions", "positions")
.leftJoinAndSelect("positions.posExecutive", "posExecutive")
.leftJoinAndSelect("current_holder.profileSalary", "profileSalary")
.leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline")
.leftJoinAndSelect("current_holder.posLevel", "posLevel")
.leftJoinAndSelect("current_holder.posType", "posType")
.where({
@ -199,8 +200,8 @@ export class OrganizationUnauthorizeController extends Controller {
child4: item.orgChild4?.orgChild4Name ? item.orgChild4.orgChild4Name : null,
result: null,
duration: null,
isPunish: false,
isSuspension: false,
isPunish: item.current_holder.profileDiscipline.length > 0 ? true : false,
isSuspension: item.current_holder == null ? false : true,
isAbsent: false,
isLeave: false,
isRetired: false,

5
src/controllers/ProfileController.ts
View file

@ -930,6 +930,7 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("posMaster.positions", "positions")
.leftJoinAndSelect("positions.posExecutive", "posExecutive")
.leftJoinAndSelect("current_holder.profileSalary", "profileSalary")
.leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline")
.leftJoinAndSelect("current_holder.posLevel", "posLevel")
.leftJoinAndSelect("current_holder.posType", "posType")
.where((qb) => {
@ -1066,8 +1067,8 @@ export class ProfileController extends Controller {
child4: item.orgChild4?.orgChild4Name ? item.orgChild4.orgChild4Name : null,
result: null,
duration: null,
isPunish: false,
isSuspension: false,
isPunish: item.current_holder.profileDiscipline.length > 0 ? true : false,
isSuspension: item.current_holder.dateRetire == null ? false : true,
isAbsent: false,
isLeave: false,
isRetired: false,