From f9584e7b55c8d72b763650738f5ee9b0ef3361bb Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Tue, 21 May 2024 16:42:13 +0800 Subject: [PATCH] update --- .../java/com/ffii/tsms/modules/report/service/ReportService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt index a01212c..f66b0b7 100644 --- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt +++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt @@ -959,7 +959,7 @@ open class ReportService( temp.forEachIndexed { index, _ -> dayInt = temp[index]["date"].toString().toInt() tempCell = sheet.getRow(dayInt.plus(7)).createCell(columnIndex) - tempCell.setCellValue(temp[index]["normalConsumed"] as Double) + tempCell.setCellValue((temp[index]["normalConsumed"] as Double) + (temp[index]["otConsumed"] as Double)) } columnIndex++ }