From 50efb0c7d0af21587312631584232a8b8d78d2d9 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Thu, 1 Aug 2024 15:54:03 +0800 Subject: [PATCH] update --- .../com/ffii/tsms/modules/report/service/ReportService.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 c2426a4..3885dc7 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 @@ -2127,14 +2127,14 @@ open class ReportService( if (args.containsKey("status")) statusFilter = when (args.get("status")) { "Potential Overconsumption" -> " having " + - " sum(t.consumedBudget) / (p.expectedTotalFee - ifnull(p.subContractFee, 0)) * 0.8 >= :lowerLimit " + - " and sum(t.consumedBudget) / (p.expectedTotalFee - ifnull(p.subContractFee, 0)) * 0.8 <= 1 " + + " (sum(t.consumedBudget) / p.expectedTotalFee) >= :lowerLimit " + + " and (sum(t.consumedBudget) / p.expectedTotalFee) <= 1 " + " or (sum(t.normalConsumed + COALESCE(t.otConsumed, 0)) / COALESCE(p.totalManhour, 0)) >= :lowerLimit " + " and (sum(t.normalConsumed + COALESCE(t.otConsumed, 0)) / COALESCE(p.totalManhour, 0)) <= 1 " "All" -> " having " + - " sum(t.consumedBudget) / (p.expectedTotalFee - ifnull(p.subContractFee, 0)) * 0.8 >= :lowerLimit " + - " or sum(t.consumedBudget) / (p.expectedTotalFee - ifnull(p.subContractFee, 0)) * 0.8 >= :lowerLimit " + " (sum(t.consumedBudget) / p.expectedTotalFee) >= :lowerLimit " + + " or (sum(t.normalConsumed + COALESCE(t.otConsumed, 0)) / COALESCE(p.totalManhour, 0)) >= :lowerLimit " else -> "" }