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

Merge branch 'develop' of github.com:Frappet/bma-ehr-development into develop

Browse source 
# Conflicts:
#	src/controllers/ReportController.ts
This commit is contained in:
kittapath 2025-01-20 14:54:56 +07:00
commit 4648331006
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/controllers/ReportController.ts
View file

@ -190,7 +190,6 @@ export class ReportController extends Controller {
return acc;
}, []);
// ตอนนี้คุณสามารถ map ข้อมูลใน 'groupedData' เพื่อสร้าง 'formattedData' ได้แล้ว
const reformattedData = groupedData.map((group, x) => {
const formattedGroup = {
rowNo: x ? Extension.ToThaiNumber((x + 1).toString()) : Extension.ToThaiNumber("๑"),
@ -213,16 +212,16 @@ export class ReportController extends Controller {
};
return {
[`strategyName${index + 1}`]: strategy.strategyName ?? "0",
[`devCount${index + 1}`]: strategy.devCount ?? "0",
[`target${index + 1}`]: "0",
[`receiveBudget${index + 1}`]: strategy.receiveBudget ?? "0",
[`sumDev${index + 1}`]: strategy.sumDev ?? "0",
[`sumTraget${index + 1}`]: strategy.sumTraget ?? "0",
[`sumBudget${index + 1}`]: strategy.sumBudget ?? "0",
[`sumRowDev`]: strategy.sumRowDev ?? "0",
[`sumRowTarget`]: strategy.sumRowTarget ?? "0",
[`sumRowBudget`]: strategy.sumRowBudget ?? "0",
[`strategyName${index + 1}`]: strategy.strategyName ?? "",
[`devCount${index + 1}`]: strategy.devCount ?? "",
[`target${index + 1}`]: "",
[`receiveBudget${index + 1}`]: strategy.receiveBudget ?? "",
[`sumDev${index + 1}`]: strategy.sumDev ?? "",
[`sumTraget${index + 1}`]: strategy.sumTraget ?? "",
[`sumBudget${index + 1}`]: strategy.sumBudget ?? "",
[`sumRowDev`]: strategy.sumRowDev ?? "",
[`sumRowTarget`]: strategy.sumRowTarget ?? "",
[`sumRowBudget`]: strategy.sumRowBudget ?? "",
};
}),
};