เพิ่มจำนวนรุ่นตามแผน
This commit is contained in:
parent
d7b095b91f
commit
c87c3f8fef
3 changed files with 72 additions and 14 deletions
|
|
@ -1394,8 +1394,13 @@ export class DevelopmentController extends Controller {
|
|||
"developmentActualPeoples",
|
||||
"developmentPlannedPeoples",
|
||||
"developmentActualGoals",
|
||||
"developmentActualGoals.posTypeActual",
|
||||
"developmentActualGoals.posLevelActual",
|
||||
"developmentActualGoals",
|
||||
"developmentPlannedGoals",
|
||||
"developmentPlannedGoals.plannedGoalPositions",
|
||||
"plannedGoalPositions.posTypePlanned",
|
||||
"plannedGoalPositions.posLevelPlanned",
|
||||
],
|
||||
});
|
||||
if (!getDevelopment) {
|
||||
|
|
@ -1422,19 +1427,44 @@ export class DevelopmentController extends Controller {
|
|||
actualGoals:
|
||||
getDevelopment.developmentActualGoals == null
|
||||
? null
|
||||
: getDevelopment.developmentActualGoals.sort((a, b) =>
|
||||
(a.groupTarget == null ? "" : a.groupTarget).localeCompare(
|
||||
b.groupTarget == null ? "" : b.groupTarget,
|
||||
),
|
||||
),
|
||||
: getDevelopment.developmentActualGoals
|
||||
.sort((a, b) =>
|
||||
(a.groupTarget == null ? "" : a.groupTarget).localeCompare(
|
||||
b.groupTarget == null ? "" : b.groupTarget,
|
||||
),
|
||||
)
|
||||
.map((x) => ({
|
||||
groupTarget: x.groupTarget,
|
||||
groupTargetSub: x.groupTargetSub,
|
||||
position: x.position,
|
||||
posTypeId: x.posTypeActualId,
|
||||
posType: x.posTypeActual == null ? null : x.posTypeActual.posTypeName,
|
||||
posLevelId: x.posLevelActualId,
|
||||
posLevel: x.posLevelActual == null ? null : x.posLevelActual.posLevelName,
|
||||
type: x.type,
|
||||
amount: x.amount,
|
||||
})),
|
||||
plannedGoals:
|
||||
getDevelopment.developmentPlannedGoals == null
|
||||
? null
|
||||
: getDevelopment.developmentPlannedGoals.sort((a, b) =>
|
||||
(a.groupTarget == null ? "" : a.groupTarget).localeCompare(
|
||||
b.groupTarget == null ? "" : b.groupTarget,
|
||||
),
|
||||
),
|
||||
: getDevelopment.developmentPlannedGoals
|
||||
.sort((a, b) =>
|
||||
(a.groupTarget == null ? "" : a.groupTarget).localeCompare(
|
||||
b.groupTarget == null ? "" : b.groupTarget,
|
||||
),
|
||||
)
|
||||
.map((x) => ({
|
||||
groupTarget: x.groupTarget,
|
||||
groupTargetSub: x.groupTargetSub,
|
||||
position: x.plannedGoalPositions.map((y) => ({
|
||||
position: y.position,
|
||||
posTypeId: y.posTypePlannedId,
|
||||
posType: y.posTypePlanned == null ? null : y.posTypePlanned.posTypeName,
|
||||
posLevelId: y.posLevelPlannedId,
|
||||
posLevel: y.posLevelPlanned == null ? null : y.posLevelPlanned.posLevelName,
|
||||
})),
|
||||
amount: x.amount,
|
||||
})),
|
||||
};
|
||||
return new HttpSuccess(_getDevelopment);
|
||||
}
|
||||
|
|
@ -1461,7 +1491,8 @@ export class DevelopmentController extends Controller {
|
|||
}
|
||||
let _getDevelopment: any = {
|
||||
developmentProjectTypes: getDevelopment.developmentProjectTypes.map((x) => x.name).sort(),
|
||||
projectModal: getDevelopment.projectModal,
|
||||
projectModalActual: getDevelopment.projectModalActual,
|
||||
projectModalPlanned: getDevelopment.projectModalPlanned,
|
||||
isBackPlanned: getDevelopment.isBackPlanned,
|
||||
isHoldPlanned: getDevelopment.isHoldPlanned,
|
||||
projectDayBackPlanned: getDevelopment.projectDayBackPlanned,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue