From f7c52006b4e22afe1cbef213dcb0d403d4eb0f66 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Wed, 2 Oct 2024 18:11:49 +0800 Subject: [PATCH 1/2] update dashboard --- .../ffii/tsms/modules/data/service/DashboardService.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt index b429a19..697b763 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt @@ -1687,7 +1687,8 @@ open class DashboardService( + " coalesce (sum(i.issueAmount) - sum(i.paidAmount),0) as receivable," + " coalesce (round((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8,2),0) as totalBudget," + " coalesce (expenditure.expenditure + sum(pc.expense), 0) as totalExpenditure," - + " coalesce ((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - expenditure.expenditure,0) as expenditureReceivable," + + " (sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - coalesce(sum(pc.expense), 0) as expenditureReceivable," +// + " coalesce ((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - expenditure.expenditure,0) as expenditureReceivable," + " sum(p.expectedTotalFee) as totalProjectFee," + " coalesce (round(sum(i.issueAmount)/sum(p.expectedTotalFee)*100,0),0) as invoicedPercentage" + " from project p" @@ -1888,8 +1889,10 @@ open class DashboardService( + " END AS remarks " + " FROM ( " + " SELECT " - + " DATE_FORMAT(pe.receiptDate, '%Y-%m') AS parsed_date, " - + " DATE_FORMAT(pe.receiptDate, '%m/%y') AS formatted_date, " +// + " DATE_FORMAT(pe.receiptDate, '%Y-%m') AS parsed_date, " +// + " DATE_FORMAT(pe.receiptDate, '%m/%y') AS formatted_date, " + + " DATE_FORMAT(pe.issueDate, '%m/%y') AS parsed_date, " + + " DATE_FORMAT(pe.issueDate, '%m/%y') AS formatted_date, " + " NULL AS income, " + " NULL AS expenditure, " + " SUM(pe.amount) AS expense, " From e4cf1623607a063a0358ca14b553bfd77d638b5a Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Wed, 2 Oct 2024 18:20:47 +0800 Subject: [PATCH 2/2] update overconsum --- .../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 f257cdd..1cf972b 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 @@ -1889,8 +1889,8 @@ open class ReportService( rowIndex = generalCreateReportIndexed(sheet, result, rowIndex, columnIndex) val sheetCF = sheet.sheetConditionalFormatting - val rule1 = sheetCF.createConditionalFormattingRule("AND(K7 >= $lowerLimit, K7 <= 1)") - val rule2 = sheetCF.createConditionalFormattingRule("K7 > 1") + val rule1 = sheetCF.createConditionalFormattingRule("AND(L7 >= $lowerLimit, L7 <= 1)") + val rule2 = sheetCF.createConditionalFormattingRule("L7 > 1") var fillOrange = rule1.createPatternFormatting() fillOrange.setFillBackgroundColor(IndexedColors.LIGHT_ORANGE.index); fillOrange.setFillPattern(PatternFormatting.SOLID_FOREGROUND) @@ -1900,7 +1900,7 @@ open class ReportService( fillRed.setFillPattern(PatternFormatting.SOLID_FOREGROUND) val cfRules = arrayOf(rule1, rule2) - val regions = arrayOf(CellRangeAddress.valueOf("\$K7:\$L${rowIndex + 1}")) + val regions = arrayOf(CellRangeAddress.valueOf("\$L7:\$M${rowIndex + 1}")) sheetCF.addConditionalFormatting(regions, cfRules); conditionalFormattingNegative(sheet)