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:
kittapath 2024-12-12 11:36:11 +07:00
parent 992a48b787
commit 9abdeca45b
5 changed files with 197 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/controllers/CommandController.ts
View file

@ -943,7 +943,7 @@ export class CommandController extends Controller {
await new permission().PermissionGet(request, "COMMAND"); await new permission().PermissionGet(request, "COMMAND");
const command = await this.commandRepository.findOne({ const command = await this.commandRepository.findOne({
where: { id }, where: { id },
relations: ["commandType"] relations: ["commandType"],
}); });
if (!command) { if (!command) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลคำสั่งนี้"); throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลคำสั่งนี้");
@ -1165,7 +1165,7 @@ export class CommandController extends Controller {
await new permission().PermissionUpdate(request, "COMMAND"); await new permission().PermissionUpdate(request, "COMMAND");
const command = await this.commandRepository.findOne({ const command = await this.commandRepository.findOne({
where: { id: id }, where: { id: id },
relations: ["commandType", "commandRecives",], relations: ["commandType", "commandRecives"],
}); });
if (!command) { if (!command) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลคำสั่งนี้"); throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลคำสั่งนี้");
@ -1255,7 +1255,7 @@ export class CommandController extends Controller {
let _data: any = null; let _data: any = null;
await Promise.all([ await Promise.all([
await new CallAPI() await new CallAPI()
.PostDataKeycloak("/realms/bma-ehr/protocol/openid-connect/token", data) .PostDataKeycloak(`/realms/${process.env.KC_REALM}/protocol/openid-connect/token`, data)
.then(async (x) => { .then(async (x) => {
_data = x; _data = x;
}) })
@ -2265,16 +2265,22 @@ export class CommandController extends Controller {
lastName: profile.lastName, lastName: profile.lastName,
}); });
// กรณี Keycloak ไม่ถูกลบ ให้ลบซ้ำอีกรอบแล้วสร้างใหม่ และหากยังไม่สามารถลบได้ให้แสดง Error // กรณี Keycloak ไม่ถูกลบ ให้ลบซ้ำอีกรอบแล้วสร้างใหม่ และหากยังไม่สามารถลบได้ให้แสดง Error
if (profile.keycloak != null && userKeycloakId && userKeycloakId.errorMessage === "User exists with same username") { if (
profile.keycloak != null &&
userKeycloakId &&
userKeycloakId.errorMessage === "User exists with same username"
) {
const delUserKeycloak = await deleteUser(profile.keycloak); const delUserKeycloak = await deleteUser(profile.keycloak);
if (delUserKeycloak) { if (delUserKeycloak) {
userKeycloakId = await createUser(profile.citizenId, profile.citizenId, { userKeycloakId = await createUser(profile.citizenId, profile.citizenId, {
firstName: profile.firstName, firstName: profile.firstName,
lastName: profile.lastName, lastName: profile.lastName,
}); });
} } else {
else { throw new HttpError(
throw new HttpError(HttpStatus.BAD_REQUEST, "พบข้อผิดพลาด ไม่สามารถจัดการผู้ใช้งานได้"); HttpStatus.BAD_REQUEST,
"พบข้อผิดพลาด ไม่สามารถจัดการผู้ใช้งานได้",
);
} }
} }
const list = await getRoles(); const list = await getRoles();
@ -3792,7 +3798,9 @@ export class CommandController extends Controller {
if ( if (
orgRevision != null && orgRevision != null &&
!["REPORT", "DONE"].includes( !["REPORT", "DONE"].includes(
orgRevision.posMasters.find((x) => x.statusReport === "REPORT" || x.statusReport === "DONE")?.statusReport || "", orgRevision.posMasters.find(
(x) => x.statusReport === "REPORT" || x.statusReport === "DONE",
)?.statusReport || "",
) )
) { ) {
await this.orgRevisionRepo.update(orgRevision.id, { await this.orgRevisionRepo.update(orgRevision.id, {

2
src/controllers/LoginController.ts
View file

@ -37,7 +37,7 @@ export class LoginController extends Controller {
let _data: any = null; let _data: any = null;
await Promise.all([ await Promise.all([
await new CallAPI() await new CallAPI()
.PostDataKeycloak("/realms/bma-ehr/protocol/openid-connect/token", data) .PostDataKeycloak(`/realms/${process.env.KC_REALM}/protocol/openid-connect/token`, data)
.then(async (x) => { .then(async (x) => {
_data = x; _data = x;
}) })

58
src/controllers/ProfileController.ts
View file

@ -278,7 +278,7 @@ export class ProfileController extends Controller {
: "-", : "-",
ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
educations: Education, educations: Education,
url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`, url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
}; };
return new HttpSuccess({ return new HttpSuccess({
@ -715,7 +715,7 @@ export class ProfileController extends Controller {
: "", : "",
telephone: telephone:
profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "", profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "",
url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`, url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
url1: _ImgUrl[0] ? _ImgUrl[0] : null, url1: _ImgUrl[0] ? _ImgUrl[0] : null,
yearUpload1: profiles.profileAvatars[0] yearUpload1: profiles.profileAvatars[0]
? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt)) ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))
@ -4248,8 +4248,8 @@ export class ProfileController extends Controller {
{ {
keyword: `%${searchKeyword}%`, keyword: `%${searchKeyword}%`,
}, },
) );
}) }),
) )
.orderBy("current_holders.posMasterNo", "ASC") .orderBy("current_holders.posMasterNo", "ASC")
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
@ -6030,8 +6030,8 @@ export class ProfileController extends Controller {
where: { where: {
citizenId: Like(`%${body.keyword}%`), citizenId: Like(`%${body.keyword}%`),
current_holders: { current_holders: {
orgRevisionId:revision?.id orgRevisionId: revision?.id,
} },
}, },
relations: [ relations: [
"posType", "posType",
@ -6050,7 +6050,8 @@ export class ProfileController extends Controller {
break; break;
case "fullName": case "fullName":
[findProfile, total] = await this.profileRepo.createQueryBuilder("profile") [findProfile, total] = await this.profileRepo
.createQueryBuilder("profile")
.leftJoinAndSelect("profile.posType", "posType") .leftJoinAndSelect("profile.posType", "posType")
.leftJoinAndSelect("profile.posLevel", "posLevel") .leftJoinAndSelect("profile.posLevel", "posLevel")
.leftJoinAndSelect("profile.current_holders", "current_holders") .leftJoinAndSelect("profile.current_holders", "current_holders")
@ -6060,7 +6061,10 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3") .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.where("current_holders.orgRevision = :revisionId", { revisionId: revision?.id }) .where("current_holders.orgRevision = :revisionId", { revisionId: revision?.id })
.andWhere("CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword", { keyword: `%${body.keyword}%` }) .andWhere(
"CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword",
{ keyword: `%${body.keyword}%` },
)
.skip(skip) .skip(skip)
.take(take) .take(take)
.getManyAndCount(); .getManyAndCount();
@ -6071,8 +6075,8 @@ export class ProfileController extends Controller {
where: { where: {
position: Like(`%${body.keyword}%`), position: Like(`%${body.keyword}%`),
current_holders: { current_holders: {
orgRevisionId:revision?.id orgRevisionId: revision?.id,
} },
}, },
relations: [ relations: [
"posType", "posType",
@ -6091,7 +6095,8 @@ export class ProfileController extends Controller {
break; break;
case "posNo": case "posNo":
[findProfile, total] = await this.profileRepo.createQueryBuilder("profile") [findProfile, total] = await this.profileRepo
.createQueryBuilder("profile")
.leftJoinAndSelect("profile.posType", "posType") .leftJoinAndSelect("profile.posType", "posType")
.leftJoinAndSelect("profile.posLevel", "posLevel") .leftJoinAndSelect("profile.posLevel", "posLevel")
.leftJoinAndSelect("profile.current_holders", "current_holders") .leftJoinAndSelect("profile.current_holders", "current_holders")
@ -6103,13 +6108,15 @@ export class ProfileController extends Controller {
.where("current_holders.orgRevision = :revisionId", { revisionId: revision?.id }) .where("current_holders.orgRevision = :revisionId", { revisionId: revision?.id })
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.orWhere(body.keyword != undefined && body.keyword != null && body.keyword != "" qb.orWhere(
body.keyword != undefined && body.keyword != null && body.keyword != ""
? queryLike ? queryLike
: "1=1", : "1=1",
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,
}) },
}) );
}),
) )
.skip(skip) .skip(skip)
.take(take) .take(take)
@ -6120,11 +6127,11 @@ export class ProfileController extends Controller {
[findProfile, total] = await this.profileRepo.findAndCount({ [findProfile, total] = await this.profileRepo.findAndCount({
where: { where: {
posType: { posType: {
posTypeName:Like(`%${body.keyword}%`) posTypeName: Like(`%${body.keyword}%`),
}, },
current_holders: { current_holders: {
orgRevisionId:revision?.id orgRevisionId: revision?.id,
} },
}, },
relations: [ relations: [
"posType", "posType",
@ -6146,11 +6153,11 @@ export class ProfileController extends Controller {
[findProfile, total] = await this.profileRepo.findAndCount({ [findProfile, total] = await this.profileRepo.findAndCount({
where: { where: {
posLevel: { posLevel: {
posLevelName:Like(`%${body.keyword}%`) posLevelName: Like(`%${body.keyword}%`),
}, },
current_holders: { current_holders: {
orgRevisionId:revision?.id orgRevisionId: revision?.id,
} },
}, },
relations: [ relations: [
"posType", "posType",
@ -6174,9 +6181,10 @@ export class ProfileController extends Controller {
current_holders: { current_holders: {
orgRevisionId: revision?.id, orgRevisionId: revision?.id,
orgRoot: { orgRoot: {
orgRootName:Like(`%${body.keyword}%`) orgRootName: Like(`%${body.keyword}%`),
} },
}}, },
},
relations: [ relations: [
"posType", "posType",
"posLevel", "posLevel",
@ -6197,8 +6205,8 @@ export class ProfileController extends Controller {
[findProfile, total] = await this.profileRepo.findAndCount({ [findProfile, total] = await this.profileRepo.findAndCount({
where: { where: {
current_holders: { current_holders: {
orgRevisionId:revision?.id orgRevisionId: revision?.id,
} },
}, },
relations: [ relations: [
"posType", "posType",

4
src/controllers/ProfileEmployeeController.ts
View file

@ -284,7 +284,7 @@ export class ProfileEmployeeController extends Controller {
: "-", : "-",
ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
educations: Education, educations: Education,
url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`, url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
}; };
return new HttpSuccess({ return new HttpSuccess({
@ -722,7 +722,7 @@ export class ProfileEmployeeController extends Controller {
: "", : "",
telephone: telephone:
profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "", profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "",
url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`, url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
url1: _ImgUrl[0] ? _ImgUrl[0] : null, url1: _ImgUrl[0] ? _ImgUrl[0] : null,
yearUpload1: profiles.profileAvatars[0] yearUpload1: profiles.profileAvatars[0]
? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt)) ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))

4
src/controllers/ProfileEmployeeTempController.ts
View file

@ -281,7 +281,7 @@ export class ProfileEmployeeTempController extends Controller {
: "-", : "-",
ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, ocFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
educations: Education, educations: Education,
url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`, url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
}; };
return new HttpSuccess({ return new HttpSuccess({
@ -719,7 +719,7 @@ export class ProfileEmployeeTempController extends Controller {
: "", : "",
telephone: telephone:
profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "", profiles.telephoneNumber != null ? Extension.ToThaiNumber(profiles.telephoneNumber) : "",
url: ImgUrl ? ImgUrl : `https://bma-ehr.frappet.synology.me/assets/avatar_user-89f22423.jpg`, url: ImgUrl ? ImgUrl : `${process.env.VITE_URL_SSO}/assets/avatar_user-89f22423.jpg`,
url1: _ImgUrl[0] ? _ImgUrl[0] : null, url1: _ImgUrl[0] ? _ImgUrl[0] : null,
yearUpload1: profiles.profileAvatars[0] yearUpload1: profiles.profileAvatars[0]
? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt)) ? Extension.ToThaiNumber(Extension.ToThaiShortYear(profiles.profileAvatars[0].createdAt))