dev #387

Merged
ysCha merged 2 commits from dev into dev-deploy 2026-02-10 14:46:51 +09:00
Showing only changes of commit bc21504c64 - Show all commits

View File

@ -1870,7 +1870,6 @@ public class EstimateService {
applyExcelNumberFormat(workbook);
applyExcelFixedNumberFormat(workbook, Arrays.asList("H25", "C12"), "#,##0.00");
applyExcelFixedNumberFormat(workbook, Arrays.asList("I2"), "#,##0.00\" kW\"");
applyExcelFixedNumberFormat(workbook, Arrays.asList("X32", "I44"), "#,##0.00");
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@ -2043,10 +2042,6 @@ public class EstimateService {
return value;
}
String normalized = raw.replace(",", "");
String upper = normalized.toUpperCase(Locale.ROOT);
if (upper.endsWith("KW")) {
normalized = normalized.substring(0, normalized.length() - 2).trim();
}
if (!normalized.matches("[-+]?\\d+(\\.\\d+)?")) {
return value;
}