浏览代码

feat: 模版配置增加文本替换,主要用于水印导致的数据错误处理

chenjianhua 4 月之前
父节点
当前提交
94db2d6cfc
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      service-daq/src/main/java/com/simuwang/daq/service/EmailTemplateService.java

+ 5 - 1
service-daq/src/main/java/com/simuwang/daq/service/EmailTemplateService.java

@@ -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)),"");
         }