|
@@ -229,7 +229,10 @@ public class EmailTemplateService {
|
|
|
Integer columnIndex = fieldEntry.getValue().getValue();
|
|
|
Cell cell = row.getCell(columnIndex + 1);
|
|
|
String fieldRule = fieldPatternMap.get(fieldName);
|
|
|
- String cellValue = getValueByPattern(ExcelUtil.getCellValue(cell), fieldRule);
|
|
|
+ String replaceText = fieldReplaceMap.get(fieldName);
|
|
|
+ String value = ExcelUtil.getCellValue(cell);
|
|
|
+ value=replaceText(value,replaceText);
|
|
|
+ String cellValue = getValueByPattern(value, fieldRule);
|
|
|
|
|
|
BigDecimal unitConvert = fieldUnitConvertMap.get(fieldName);
|
|
|
cellValue = getValueAfterUnitConvert(cellValue, unitConvert);
|
|
@@ -267,6 +270,7 @@ public class EmailTemplateService {
|
|
|
if(StringUtil.isEmpty(replaceText) || StringUtil.isEmpty(value)){
|
|
|
return value;
|
|
|
}
|
|
|
+ value = value.replaceAll(" ","");
|
|
|
for(int i=0;i<replaceText.length();i++){
|
|
|
value = value.replaceAll(String.valueOf(replaceText.charAt(i)),"");
|
|
|
}
|