บัญชี 2 แบบร่าง ข้อมูลแสดงไม่ครบ #164
This commit is contained in:
Bright
parent
c9edb8c690
commit
02f19d66ad
1 changed files with 80 additions and 29 deletions
|
|
@ -4592,11 +4592,11 @@ 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)),
|
||||
// ];
|
||||
// }
|
||||
if (positionMasterOld && positionMasterOld.positions) {
|
||||
profilePositionName = [
|
||||
...new Set(positionMasterOld.positions.map((x: any) => x.positionName)),
|
||||
|
|
@ -4684,6 +4684,11 @@ export class ReportController extends Controller {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (positionMasterProfileOld == null && posMaster.next_holder != null
|
||||
&& posMaster.next_holder.current_holders == null
|
||||
) {
|
||||
positionMasterProfileOld = positionMasterOld
|
||||
}
|
||||
let node = {
|
||||
posMasterOrder: posMaster.posMasterOrder, //
|
||||
isSit: posMaster.isSit, //
|
||||
|
|
@ -4783,17 +4788,23 @@ export class ReportController extends Controller {
|
|||
? positionMasterOld == null
|
||||
? posType.join(" หรือ ")
|
||||
: profilePosType.join(" หรือ ")
|
||||
: posMaster.next_holder.posType == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posType.posTypeName,
|
||||
// : posMaster.next_holder.posType.posTypeName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posType?.posTypeName,
|
||||
profilePosLevel:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
? posLevel.join(" หรือ ")
|
||||
: profilePosLevel.join(" หรือ ")
|
||||
: posMaster.next_holder.posLevel == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posLevel.posLevelName,
|
||||
// : posMaster.next_holder.posLevel.posLevelName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posLevel?.posLevelName,
|
||||
profilePosExecutive:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
|
|
@ -5087,7 +5098,11 @@ export class ReportController extends Controller {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (positionMasterProfileOld == null && posMaster.next_holder != null
|
||||
&& posMaster.next_holder.current_holders == null
|
||||
) {
|
||||
positionMasterProfileOld = positionMasterOld
|
||||
}
|
||||
let node = {
|
||||
posMasterOrder: posMaster.posMasterOrder, //
|
||||
isSit: posMaster.isSit, //
|
||||
|
|
@ -5188,17 +5203,23 @@ export class ReportController extends Controller {
|
|||
? positionMasterOld == null
|
||||
? posType.join(" หรือ ")
|
||||
: profilePosType.join(" หรือ ")
|
||||
: posMaster.next_holder.posType == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posType.posTypeName,
|
||||
// : posMaster.next_holder.posType.posTypeName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posType?.posTypeName,
|
||||
profilePosLevel:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
? posLevel.join(" หรือ ")
|
||||
: profilePosLevel.join(" หรือ ")
|
||||
: posMaster.next_holder.posLevel == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posLevel.posLevelName,
|
||||
// : posMaster.next_holder.posLevel.posLevelName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posLevel?.posLevelName,
|
||||
profilePosExecutive:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
|
|
@ -5499,7 +5520,11 @@ export class ReportController extends Controller {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (positionMasterProfileOld == null && posMaster.next_holder != null
|
||||
&& posMaster.next_holder.current_holders == null
|
||||
) {
|
||||
positionMasterProfileOld = positionMasterOld
|
||||
}
|
||||
let node = {
|
||||
posMasterOrder: posMaster.posMasterOrder, //
|
||||
isSit: posMaster.isSit, //
|
||||
|
|
@ -5600,17 +5625,23 @@ export class ReportController extends Controller {
|
|||
? positionMasterOld == null
|
||||
? posType.join(" หรือ ")
|
||||
: profilePosType.join(" หรือ ")
|
||||
: posMaster.next_holder.posType == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posType.posTypeName,
|
||||
// : posMaster.next_holder.posType.posTypeName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posType?.posTypeName,
|
||||
profilePosLevel:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
? posLevel.join(" หรือ ")
|
||||
: profilePosLevel.join(" หรือ ")
|
||||
: posMaster.next_holder.posLevel == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posLevel.posLevelName,
|
||||
// : posMaster.next_holder.posLevel.posLevelName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posLevel?.posLevelName,
|
||||
profilePosExecutive:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
|
|
@ -5912,7 +5943,11 @@ export class ReportController extends Controller {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (positionMasterProfileOld == null && posMaster.next_holder != null
|
||||
&& posMaster.next_holder.current_holders == null
|
||||
) {
|
||||
positionMasterProfileOld = positionMasterOld
|
||||
}
|
||||
let node = {
|
||||
posMasterOrder: posMaster.posMasterOrder, //
|
||||
isSit: posMaster.isSit, //
|
||||
|
|
@ -6013,17 +6048,23 @@ export class ReportController extends Controller {
|
|||
? positionMasterOld == null
|
||||
? posType.join(" หรือ ")
|
||||
: profilePosType.join(" หรือ ")
|
||||
: posMaster.next_holder.posType == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posType.posTypeName,
|
||||
// : posMaster.next_holder.posType.posTypeName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posType?.posTypeName,
|
||||
profilePosLevel:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
? posLevel.join(" หรือ ")
|
||||
: profilePosLevel.join(" หรือ ")
|
||||
: posMaster.next_holder.posLevel == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posLevel.posLevelName,
|
||||
// : posMaster.next_holder.posLevel.posLevelName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posLevel?.posLevelName,
|
||||
profilePosExecutive:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
|
|
@ -6332,7 +6373,11 @@ export class ReportController extends Controller {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (positionMasterProfileOld == null && posMaster.next_holder != null
|
||||
&& posMaster.next_holder.current_holders == null
|
||||
) {
|
||||
positionMasterProfileOld = positionMasterOld
|
||||
}
|
||||
let node = {
|
||||
posMasterOrder: posMaster.posMasterOrder, //
|
||||
isSit: posMaster.isSit, //
|
||||
|
|
@ -6433,17 +6478,23 @@ export class ReportController extends Controller {
|
|||
? positionMasterOld == null
|
||||
? posType.join(" หรือ ")
|
||||
: profilePosType.join(" หรือ ")
|
||||
: posMaster.next_holder.posType == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posType.posTypeName,
|
||||
// : posMaster.next_holder.posType.posTypeName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posType?.posTypeName,
|
||||
profilePosLevel:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
? posLevel.join(" หรือ ")
|
||||
: profilePosLevel.join(" หรือ ")
|
||||
: posMaster.next_holder.posLevel == null
|
||||
: positionMasterProfileOld == null
|
||||
? "-"
|
||||
: posMaster.next_holder.posLevel.posLevelName,
|
||||
// : posMaster.next_holder.posLevel.posLevelName,
|
||||
: positionMasterProfileOld.positions.find(
|
||||
(x: any) => x.positionIsSelected == true,
|
||||
)?.posLevel?.posLevelName,
|
||||
profilePosExecutive:
|
||||
posMaster.next_holder == null
|
||||
? positionMasterOld == null
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue