From e517ce7fe82f26929e0296a6401de6fb8173d9fc Mon Sep 17 00:00:00 2001
From: "MSI\\2Fi" <jason.tom@2fi-solutions.com.hk>
Date: Fri, 17 May 2024 12:09:38 +0800
Subject: [PATCH] update formula

---
 .../java/com/ffii/tsms/modules/report/service/ReportService.kt  | 2 +-
 .../java/com/ffii/tsms/modules/report/web/ReportController.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 9e19cb4..5761c88 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
@@ -250,7 +250,7 @@ open class ReportService(
 
             val uninvoiceCell = row.createCell(11)
             uninvoiceCell.apply {
-                cellFormula = " IF(H${rowNum}<I${rowNum},H${rowNum}-K${rowNum},I${rowNum}-K${rowNum}) "
+                cellFormula = " IF(H15<=I15, H15-K15, IF(AND(H15>I15, I15<K15), 0, IF(AND(H15>I15, I15>=K15), I15-K15, 0))) "
                 cellStyle = boldFontCellStyle
                 cellStyle.dataFormat = accountingStyle
             }
diff --git a/src/main/java/com/ffii/tsms/modules/report/web/ReportController.kt b/src/main/java/com/ffii/tsms/modules/report/web/ReportController.kt
index 0dd06f1..2e244bc 100644
--- a/src/main/java/com/ffii/tsms/modules/report/web/ReportController.kt
+++ b/src/main/java/com/ffii/tsms/modules/report/web/ReportController.kt
@@ -45,7 +45,7 @@ class ReportController(
     @Throws(ServletRequestBindingException::class, IOException::class)
     fun getFinancialStatusReport(@RequestBody @Valid request: FinancialStatusReportRequest): ResponseEntity<Resource> {
 
-
+        println(request.teamLeadId)
         val reportResult: ByteArray = excelReportService.genFinancialStatusReport(request.teamLeadId)
 
         return ResponseEntity.ok()