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

แก้บัคระบบพัฒนา

Browse source
This commit is contained in:
Bright 2025-04-10 11:11:53 +07:00
parent c6668cbc27
commit 3163340215
3 changed files with 59 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/ReportController.ts
View file

@ -16,6 +16,7 @@ import { isNotEmittedStatement } from "typescript";
@Tags("Report")
@Security("bearerAuth")
export class ReportController extends Controller {
private developmentRepository = AppDataSource.getRepository(Development);
private developmentScholarshipRepository = AppDataSource.getRepository(DevelopmentScholarship);
private viewDevScholarship = AppDataSource.getRepository(viewDevScholarship);
/**
@ -44,6 +45,7 @@ export class ReportController extends Controller {
.leftJoinAndSelect("development.strategyChild5Actual", "strategy5")
.where("development.status = :status", { status: "FINISH" })
.andWhere("development.strategyChild1ActualId IS NOT NULL")
.andWhere("development.rootDnaId = :rootDnaId", { rootDnaId: rootId })
.select([
"development.id AS id",
"development.projectName AS projectName",
@ -114,6 +116,7 @@ export class ReportController extends Controller {
.leftJoinAndSelect("development.strategyChild1Actual", "strategy1")
.where("development.status = :status", { status: "FINISH" })
.andWhere("development.strategyChild1ActualId IS NOT NULL")
.andWhere("development.rootDnaId = :rootDnaId", { rootDnaId: rootId })
.select([
"development.rootId AS rootId",
"development.strategyChild1ActualId AS strategyId",
@ -377,10 +380,17 @@ export class ReportController extends Controller {
return formattedGroup;
});
const dev = await this.developmentRepository.findOne({
where: { rootDnaId: rootId },
select: ["root", "year"]
})
return new HttpSuccess({
template: "development",
reportName: "development",
data: {
root: dev && dev.root ? dev.root : "-",
year: dev && dev.year ? Extension.ToThaiNumber((dev.year+543).toString()) : "-",
data: mappedDataDev,
resultAllStrategy: reformattedData,
sumDev1: Extension.ToThaiNumber(sumDev1.toLocaleString()) ?? "-",