From b1c88e98729177d18ceb2e34765879e5e3e6fa50 Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 19 Nov 2024 18:07:06 +0700 Subject: [PATCH 1/2] no message --- src/controllers/ReportController.ts | 146 ++++++++++++---------------- 1 file changed, 64 insertions(+), 82 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 25429f52..d6ef7b8c 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -12,10 +12,12 @@ import { OrgChild3 } from "../entities/OrgChild3"; import { OrgChild4 } from "../entities/OrgChild4"; import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; +import { PosMaster } from "../entities/PosMaster"; import Extension from "../interfaces/extension"; +import { LeaveType } from "../entities/LeaveType"; @Route("api/v1/org/report") @Tags("Report") -@Security("bearerAuth") +// @Security("bearerAuth") @Response( HttpStatusCode.INTERNAL_SERVER_ERROR, "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง", @@ -29,6 +31,7 @@ export class ReportController extends Controller { private child4Repository = AppDataSource.getRepository(OrgChild4); private posTypepository = AppDataSource.getRepository(PosType); private posLevelRepository = AppDataSource.getRepository(PosLevel); + private posMasterRepository = AppDataSource.getRepository(PosMaster); /** * API Report1 @@ -4092,90 +4095,69 @@ export class ReportController extends Controller { @Get("report4/{rootId}") async findReport4(@Path() rootId: string) { - const orgRootData = await this.orgRootRepository.find({ - where: { - id: rootId, - }, - order: { orgRootOrder: "ASC" }, - relations: [ - "posMasters", - "posMasters.positions", - "posMasters.positions.posLevel", - "posMasters.positions.posType", - "posMasters.positions.posExecutive", - ], - }); - if(!rootId) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); - const posType = await this.posTypepository.find({ - order: { - posTypeRank: "ASC", - posLevels: { "posLevelRank": "ASC" } - }, - relations: ["posLevels"] + const orgRootData = await this.orgRootRepository.findOne({ + where: { id: rootId } }); + if (!orgRootData) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); + + const posMaster = await this.posMasterRepository + .createQueryBuilder("posMaster") + .leftJoinAndSelect("posMaster.positions", "position") + .leftJoinAndSelect("position.posType", "posType") + .leftJoinAndSelect("position.posLevel", "posLevel") + .where("posMaster.orgRootId = :rootId", { rootId }) + .orderBy("posType.posTypeRank", "ASC") + .addOrderBy("posLevel.posLevelRank", "ASC") + .getMany(); + + const _posMaster = posMaster.map((x) => ({ + type: [...new Set(x.positions.flatMap((y) => y.posType.posTypeName))].join(","), + typeRank: [...new Set(x.positions.flatMap((y) => y.posType.posTypeRank))].join(""), + level: [...new Set(x.positions.flatMap((y) => y.posLevel.posLevelName))].join(","), + levelRank: [...new Set(x.positions.flatMap((y) => `${y.posType.posTypeRank}${y.posLevel.posLevelRank}`))].join(""), + })) + // .sort((x:any, y:any) => parseInt(x.typeRank) - parseInt(y.typeRank)) + // .sort((x:any, y:any) => parseInt(x.levelRank) - parseInt(y.levelRank)); - const posLevel = await this.posLevelRepository.find({ - order: {"posLevelRank": "ASC"} - }); - - const mapData = posType.map((type) => ({ - id: type.id, - typeName: type.posTypeName, - levels: posLevel - .filter((level) => level.posTypeId === type.id) - .map((level) => ({ levelName: level.posLevelName, id: level.id })), - })); - - let _data: any = []; - mapData.forEach((type, idx) => { - type.levels.forEach((level, idy) => { - _data.push({ - typeName: idy == 0 ? type.typeName : "", - levelName: level.levelName, - total: orgRootData.length > 0 - ? orgRootData[0].posMasters - .flatMap((x) => x.positions - .filter((y) => y.posLevelId === level.id && y.posTypeId === type.id ) - .map((z) => ({ - position: z.positionName || "" - }) - )).length - : 0, - remark: "" - }); - }); - _data.push({ - typeName: "", - levelName: "รวม", - total: orgRootData.length > 0 - ? orgRootData[0].posMasters - .flatMap((x) => x.positions - .filter((y) => y.posTypeId === type.id ) - .map((z) => ({ - position: z.positionName || "" - }) - )).length - : 0, - remark: "" - }); - }); - _data.push({ - typeName: "", - levelName: "รวมทั้งสิ้น", - total: orgRootData.length > 0 - ? orgRootData[0].posMasters.flatMap((x) => x.positions).length - : 0, - remark: "" - }); + // console.log("XXX: ",_posMaster) + const groupPosMaster = _posMaster.reduce((total: any, idx: any) => { + const sortedLevel = idx.level.split(",").sort().join(","); + const key = `${idx.type}-${sortedLevel}`; + + if (!total[key]) { + total[key] = { + type: idx.type, + typeRank: idx.typeRank, + level: sortedLevel, + LeaveType: idx.levelRank, + total: 0, + remark: "" + }; + } + total[key].total += 1; + return total; + }, {}); + let result = Object.values(groupPosMaster) + .sort((x:any, y:any) => parseInt(x.typeRank) - parseInt(y.typeRank)) + .sort((x:any, y:any) => parseInt(x.levelRank) - parseInt(y.levelRank));; + // let _TypeTemp = ""; + // result = result.map((item: any) => { + // if (item.type === _TypeTemp) { + // return { ...item, type: "" }; + // } + // _TypeTemp = item.type; + // return item; + // }); + return new HttpSuccess({ - template: "report4", - reportName: "report4", - data: { - dateCurrent: Extension.ToThaiShortDate(new Date()), - rootName: orgRootData.length > 0 ? orgRootData[0].orgRootName : "-", - data: _data - } - }); + template: "report4", + reportName: "report4", + data: { + dateCurrent: Extension.ToThaiShortDate(new Date()), + rootName: orgRootData ? orgRootData.orgRootName : "-", + data: result + } + }); } } From b85de85d7eec70dd128da2acd86d3bbc4e8f8e5b Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 19 Nov 2024 18:13:08 +0700 Subject: [PATCH 2/2] no message --- src/controllers/ReportController.ts | 91 +---------------------------- 1 file changed, 2 insertions(+), 89 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index cf6c787e..e126509b 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -6246,31 +6246,9 @@ export class ReportController extends Controller { @Get("report4/{rootId}") async findReport4(@Path() rootId: string) { -<<<<<<< HEAD + const orgRootData = await this.orgRootRepository.findOne({ where: { id: rootId } -======= - const orgRootData = await this.orgRootRepository.find({ - where: { - id: rootId, - }, - order: { orgRootOrder: "ASC" }, - relations: [ - "posMasters", - "posMasters.positions", - "posMasters.positions.posLevel", - "posMasters.positions.posType", - "posMasters.positions.posExecutive", - ], - }); - if (!rootId) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); - const posType = await this.posTypepository.find({ - order: { - posTypeRank: "ASC", - posLevels: { posLevelRank: "ASC" }, - }, - relations: ["posLevels"], ->>>>>>> develop }); if (!orgRootData) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล"); @@ -6293,7 +6271,7 @@ export class ReportController extends Controller { // .sort((x:any, y:any) => parseInt(x.typeRank) - parseInt(y.typeRank)) // .sort((x:any, y:any) => parseInt(x.levelRank) - parseInt(y.levelRank)); -<<<<<<< HEAD + // console.log("XXX: ",_posMaster) const groupPosMaster = _posMaster.reduce((total: any, idx: any) => { const sortedLevel = idx.level.split(",").sort().join(","); @@ -6334,71 +6312,6 @@ export class ReportController extends Controller { data: result } }); -======= - const posLevel = await this.posLevelRepository.find({ - order: { posLevelRank: "ASC" }, - }); - const mapData = posType.map((type) => ({ - id: type.id, - typeName: type.posTypeName, - levels: posLevel - .filter((level) => level.posTypeId === type.id) - .map((level) => ({ levelName: level.posLevelName, id: level.id })), - })); - - let _data: any = []; - mapData.forEach((type, idx) => { - type.levels.forEach((level, idy) => { - _data.push({ - typeName: idy == 0 ? type.typeName : "", - levelName: level.levelName, - total: - orgRootData.length > 0 - ? orgRootData[0].posMasters.flatMap((x) => - x.positions - .filter((y) => y.posLevelId === level.id && y.posTypeId === type.id) - .map((z) => ({ - position: z.positionName || "", - })), - ).length - : 0, - remark: "", - }); - }); - _data.push({ - typeName: "", - levelName: "รวม", - total: - orgRootData.length > 0 - ? orgRootData[0].posMasters.flatMap((x) => - x.positions - .filter((y) => y.posTypeId === type.id) - .map((z) => ({ - position: z.positionName || "", - })), - ).length - : 0, - remark: "", - }); - }); - _data.push({ - typeName: "", - levelName: "รวมทั้งสิ้น", - total: - orgRootData.length > 0 ? orgRootData[0].posMasters.flatMap((x) => x.positions).length : 0, - remark: "", - }); - - return new HttpSuccess({ - template: "report4", - reportName: "report4", - data: { - dateCurrent: Extension.ToThaiShortDate(new Date()), - rootName: orgRootData.length > 0 ? orgRootData[0].orgRootName : "-", - data: _data, - }, - }); ->>>>>>> develop } }