update current
This commit is contained in:
parent
b0f5ff78d8
commit
8b7de2a0ba
6 changed files with 86 additions and 54 deletions
|
|
@ -1321,7 +1321,7 @@ export class ProfileController extends Controller {
|
|||
"profileLeave.dateLeaveEnd AS dateLeaveEnd",
|
||||
"profileLeave.leaveDays AS leaveDays",
|
||||
"profileLeave.reason AS reason",
|
||||
"leaveType.name as name"
|
||||
"leaveType.name as name",
|
||||
])
|
||||
.where("profileLeave.profileId = :profileId", { profileId: id })
|
||||
.andWhere("leaveType.code IN (:...codes)", { codes: ["LV-008", "LV-009", "LV-010"] })
|
||||
|
|
@ -1331,10 +1331,12 @@ export class ProfileController extends Controller {
|
|||
const leaves2 =
|
||||
leave2_raw.length > 0
|
||||
? leave2_raw.map((item) => ({
|
||||
date: item.dateLeaveStart && item.dateLeaveEnd
|
||||
? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart)) + " - "
|
||||
+ Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveEnd))
|
||||
: "-",
|
||||
date:
|
||||
item.dateLeaveStart && item.dateLeaveEnd
|
||||
? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart)) +
|
||||
" - " +
|
||||
Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveEnd))
|
||||
: "-",
|
||||
type: item.name || "-",
|
||||
leaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "-",
|
||||
reason: item.reason || "-",
|
||||
|
|
@ -1684,24 +1686,22 @@ export class ProfileController extends Controller {
|
|||
)
|
||||
: "";
|
||||
|
||||
let portfolios:any
|
||||
await new CallAPI()
|
||||
.GetData(req, `/development/portfolio/kk1/${profiles?.keycloak}`)
|
||||
.then((x) => {
|
||||
portfolios = x;
|
||||
})
|
||||
.catch(() => {});
|
||||
let portfolios: any;
|
||||
await new CallAPI()
|
||||
.GetData(req, `/development/portfolio/kk1/${profiles?.keycloak}`)
|
||||
.then((x) => {
|
||||
portfolios = x;
|
||||
})
|
||||
.catch(() => {});
|
||||
if (!portfolios) {
|
||||
portfolios = [{ name: "-", year: "-" }]
|
||||
}
|
||||
else {
|
||||
portfolios = portfolios.map((x:any) => ({
|
||||
portfolios = [{ name: "-", year: "-" }];
|
||||
} else {
|
||||
portfolios = portfolios.map((x: any) => ({
|
||||
name: x.name ? Extension.ToThaiNumber(x.name) : "-",
|
||||
year: x.year ? Extension.ToThaiNumber(x.year.toString()) : "-"
|
||||
}))
|
||||
year: x.year ? Extension.ToThaiNumber(x.year.toString()) : "-",
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
|
||||
const data = {
|
||||
fullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
|
||||
prefix: profiles?.prefix != null ? profiles.prefix : "",
|
||||
|
|
@ -1855,7 +1855,7 @@ export class ProfileController extends Controller {
|
|||
assessments,
|
||||
profileAbility,
|
||||
otherIncome,
|
||||
portfolios
|
||||
portfolios,
|
||||
};
|
||||
|
||||
return new HttpSuccess({
|
||||
|
|
@ -2855,7 +2855,8 @@ export class ProfileController extends Controller {
|
|||
},
|
||||
});
|
||||
if (!posMaster) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลการครองตำแหน่ง");
|
||||
posMaster.current_holderId = "";
|
||||
posMaster.current_holderId = null;
|
||||
posMaster.lastUpdatedAt = new Date();
|
||||
// return new HttpSuccess({ data: [], total: 0 });
|
||||
} else if ((posMaster?.current_holder?.posLevel?.posLevelAuthority ?? null) == "GOVERNOR") {
|
||||
return new HttpSuccess({ data: [], total: 0 });
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue