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

Merge branch 'develop'

Browse source
This commit is contained in:
kittapath 2024-12-26 22:19:10 +07:00
commit cc254227f8
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/controllers/DevelopmentController.ts
View file

@ -1944,7 +1944,7 @@ export class DevelopmentController extends Controller {
}) })
.andWhere( .andWhere(
keyword != undefined keyword != undefined
? new Brackets ((qb) => { ? new Brackets((qb) => {
qb.where("development.projectName LIKE :keyword") qb.where("development.projectName LIKE :keyword")
.orWhere("development.root LIKE :keyword") .orWhere("development.root LIKE :keyword")
.orWhere("development.child1 LIKE :keyword") .orWhere("development.child1 LIKE :keyword")
@ -2610,7 +2610,7 @@ export class DevelopmentController extends Controller {
async developmentDetail( async developmentDetail(
@Path() developmentId: string, @Path() developmentId: string,
@Path() type: string, @Path() type: string,
@Request() request: RequestWithUser @Request() request: RequestWithUser,
) { ) {
const getDevelopment = await this.developmentRepository.findOne({ const getDevelopment = await this.developmentRepository.findOne({
where: { id: developmentId }, where: { id: developmentId },
@ -2625,13 +2625,17 @@ export class DevelopmentController extends Controller {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรมนี้"); throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรมนี้");
if (type.trim().toLocaleUpperCase() == "OFFICER") { if (type.trim().toLocaleUpperCase() == "OFFICER") {
let _workflow = await new permission().Workflow(request, developmentId, "SYS_REGISTRY_OFFICER"); let _workflow = await new permission().Workflow(
request,
developmentId,
"SYS_REGISTRY_OFFICER",
);
if (_workflow == false) await new permission().PermissionGet(request, "SYS_REGISTRY_OFFICER"); if (_workflow == false) await new permission().PermissionGet(request, "SYS_REGISTRY_OFFICER");
} else if (type.trim().toLocaleUpperCase() == "USER") { } else if (type.trim().toLocaleUpperCase() == "USER") {
} else { } else {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่สามารถเข้าถึงข้อมูลนี้ได้"); throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่สามารถเข้าถึงข้อมูลนี้ได้");
} }
let _getDevelopment: any = { let _getDevelopment: any = {
id: getDevelopment.id, id: getDevelopment.id,
evaluationId: null, evaluationId: null,
@ -2651,7 +2655,7 @@ export class DevelopmentController extends Controller {
selectType: "PROJECT", selectType: "PROJECT",
selectTypeYear: getDevelopment.year, selectTypeYear: getDevelopment.year,
selectTypeId: null, selectTypeId: null,
developmentProjects : getDevelopment.developmentProjectTechniqueActuals developmentProjects: getDevelopment.developmentProjectTechniqueActuals
.map((x) => x.name) .map((x) => x.name)
.sort(), .sort(),
}; };
@ -2698,11 +2702,12 @@ export class DevelopmentController extends Controller {
if (oldProfile.isDone == true) return; if (oldProfile.isDone == true) return;
} }
if (item["ประเภท"] == undefined) return; if (item["ประเภท"] == undefined) return;
let development = Object.assign(new DevelopmentHistory(), oldProfile);
if (item["ประเภท"] == "ข้าราชการกรุงเทพมหานครสามัญ" || item["ประเภท"] == "ขรก.กทม. สามัญ") { if (item["ประเภท"] == "ข้าราชการกรุงเทพมหานครสามัญ" || item["ประเภท"] == "ขรก.กทม. สามัญ") {
await new CallAPI() await new CallAPI()
.GetData(request, `/org/unauthorize/officer/citizen/${item["รหัสประจำตัวประชาชน"]}`) .GetData(request, `/org/unauthorize/officer/citizen/${item["รหัสประจำตัวประชาชน"]}`)
.then(async (x: any) => { .then(async (x: any) => {
let development = Object.assign(new DevelopmentHistory(), x); development = Object.assign(development, x);
development.dateStart = development.dateStart =
item["วันที่เริ่มต้น"] == undefined ? null : item["วันที่เริ่มต้น"]; item["วันที่เริ่มต้น"] == undefined ? null : item["วันที่เริ่มต้น"];
development.dateEnd = development.dateEnd =
@ -2738,7 +2743,6 @@ export class DevelopmentController extends Controller {
setLogDataDiff(request, { before, after: development }); setLogDataDiff(request, { before, after: development });
}) })
.catch(async (x) => { .catch(async (x) => {
let development = new DevelopmentHistory();
let _null: any = null; let _null: any = null;
development.prefix = item["คำนำหน้า"] == undefined ? null : item["คำนำหน้า"]; development.prefix = item["คำนำหน้า"] == undefined ? null : item["คำนำหน้า"];
development.firstName = item["ชื่อ"] == undefined ? null : item["ชื่อ"]; development.firstName = item["ชื่อ"] == undefined ? null : item["ชื่อ"];
@ -2789,7 +2793,7 @@ export class DevelopmentController extends Controller {
`/org/unauthorize/employee-prem/citizen/${item["รหัสประจำตัวประชาชน"]}`, `/org/unauthorize/employee-prem/citizen/${item["รหัสประจำตัวประชาชน"]}`,
) )
.then(async (x: any) => { .then(async (x: any) => {
let development = Object.assign(new DevelopmentHistory(), x); development = Object.assign(development, x);
development.dateStart = development.dateStart =
item["วันที่เริ่มต้น"] == undefined ? null : item["วันที่เริ่มต้น"]; item["วันที่เริ่มต้น"] == undefined ? null : item["วันที่เริ่มต้น"];
development.dateEnd = development.dateEnd =
@ -2825,7 +2829,6 @@ export class DevelopmentController extends Controller {
setLogDataDiff(request, { before, after: development }); setLogDataDiff(request, { before, after: development });
}) })
.catch(async (x) => { .catch(async (x) => {
let development = new DevelopmentHistory();
let _null: any = null; let _null: any = null;
development.prefix = item["คำนำหน้า"] == undefined ? null : item["คำนำหน้า"]; development.prefix = item["คำนำหน้า"] == undefined ? null : item["คำนำหน้า"];
development.firstName = item["ชื่อ"] == undefined ? null : item["ชื่อ"]; development.firstName = item["ชื่อ"] == undefined ? null : item["ชื่อ"];