From 930b716f1faf7f040f2de1fa694092c9a1f5b412 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Thu, 1 Aug 2024 15:40:23 +0800 Subject: [PATCH] update --- .../com/ffii/tsms/modules/report/service/ReportService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 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 242ce9e..07904d4 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,13 +2127,13 @@ open class ReportService( if (args.containsKey("status")) statusFilter = when (args.get("status")) { "Potential Overconsumption" -> " having " + - " (sum(t.consumedBudget) / p.expectedTotalFee) >= :lowerLimit " + - " and (sum(t.consumedBudget) / p.expectedTotalFee) <= 1 " + + " 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 " + " 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) >= :lowerLimit " + + " sum(t.consumedBudget) / (p.expectedTotalFee - ifnull(p.subContractFee, 0)) * 0.8 >= :lowerLimit " + " or (sum(t.consumedBudget) / p.expectedTotalFee) >= :lowerLimit " else -> ""