| @@ -1889,8 +1889,8 @@ open class ReportService( | |||||
| rowIndex = generalCreateReportIndexed(sheet, result, rowIndex, columnIndex) | rowIndex = generalCreateReportIndexed(sheet, result, rowIndex, columnIndex) | ||||
| val sheetCF = sheet.sheetConditionalFormatting | 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() | var fillOrange = rule1.createPatternFormatting() | ||||
| fillOrange.setFillBackgroundColor(IndexedColors.LIGHT_ORANGE.index); | fillOrange.setFillBackgroundColor(IndexedColors.LIGHT_ORANGE.index); | ||||
| fillOrange.setFillPattern(PatternFormatting.SOLID_FOREGROUND) | fillOrange.setFillPattern(PatternFormatting.SOLID_FOREGROUND) | ||||
| @@ -1900,7 +1900,7 @@ open class ReportService( | |||||
| fillRed.setFillPattern(PatternFormatting.SOLID_FOREGROUND) | fillRed.setFillPattern(PatternFormatting.SOLID_FOREGROUND) | ||||
| val cfRules = arrayOf(rule1, rule2) | 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); | sheetCF.addConditionalFormatting(regions, cfRules); | ||||
| conditionalFormattingNegative(sheet) | conditionalFormattingNegative(sheet) | ||||