[1379] 견적서 출력 zip, address, tel, fax 수정
This commit is contained in:
parent
fe9dc881f5
commit
bc21504c64
@ -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;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user