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

no message

Browse source
This commit is contained in:
Bright 2025-09-22 15:59:21 +07:00
parent 02f19d66ad
commit 57c9a84c40
1 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/controllers/ReportController.ts
View file

@ -4592,11 +4592,6 @@ export class ReportController extends Controller {
(x: any) =>
x.orgRevisionId == orgRevisionActive.id && x.ancestorDNA == posMaster.ancestorDNA,
);
// if (positionMasterOld && positionMasterOld.positions) {
// profilePositionName = [
// ...new Set(positionMasterOld.positions.map((x: any) => x.positionName)),
// ];
// }
if (positionMasterOld && positionMasterOld.positions) {
profilePositionName = [
...new Set(positionMasterOld.positions.map((x: any) => x.positionName)),
@ -4822,12 +4817,18 @@ export class ReportController extends Controller {
if (_node == null) {
const head = {
posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()),
profileFullname:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgName.toString())
: Extension.ToThaiNumber(node.orgTreeName.toString()),
posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()),
positionName: "",
posType: "",
posLevel: "",
profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()),
profilePosMasterNo:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgShortName.toString())
: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profilePosExecutive: "",
profilePositionName: "",
profilePosType: "",
@ -5237,12 +5238,18 @@ export class ReportController extends Controller {
if (_node == null) {
const head = {
posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()),
profileFullname:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgName.toString())
: Extension.ToThaiNumber(node.orgTreeName.toString()),
posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()),
positionName: "",
posType: "",
posLevel: "",
profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()),
profilePosMasterNo:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgShortName.toString())
: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profilePosExecutive: "",
profilePositionName: "",
profilePosType: "",
@ -5659,12 +5666,18 @@ export class ReportController extends Controller {
if (_node == null) {
const head = {
posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()),
profileFullname:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgName.toString())
: Extension.ToThaiNumber(node.orgTreeName.toString()),
posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()),
positionName: "",
posType: "",
posLevel: "",
profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()),
profilePosMasterNo:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgShortName.toString())
: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profilePosExecutive: "",
profilePositionName: "",
profilePosType: "",
@ -6082,12 +6095,18 @@ export class ReportController extends Controller {
if (_node == null) {
const head = {
posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()),
profileFullname:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgName.toString())
: Extension.ToThaiNumber(node.orgTreeName.toString()),
posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()),
positionName: "",
posType: "",
posLevel: "",
profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()),
profilePosMasterNo:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgShortName.toString())
: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profilePosExecutive: "",
profilePositionName: "",
profilePosType: "",
@ -6512,12 +6531,18 @@ export class ReportController extends Controller {
if (_node == null) {
const head = {
posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()),
profileFullname:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgName.toString())
: Extension.ToThaiNumber(node.orgTreeName.toString()),
posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()),
positionName: "",
posType: "",
posLevel: "",
profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()),
profilePosMasterNo:
posMaster.next_holder == null
? Extension.ToThaiNumber(node.profileOrgShortName.toString())
: Extension.ToThaiNumber(node.orgTreeShortName.toString()),
profilePosExecutive: "",
profilePositionName: "",
profilePosType: "",