|
@@ -1,6 +1,7 @@
|
|
package com.simuwang.daq.service;
|
|
package com.simuwang.daq.service;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
+import cn.hutool.core.collection.ListUtil;
|
|
import cn.hutool.core.exceptions.ExceptionUtil;
|
|
import cn.hutool.core.exceptions.ExceptionUtil;
|
|
import cn.hutool.core.lang.Pair;
|
|
import cn.hutool.core.lang.Pair;
|
|
import cn.hutool.core.map.MapUtil;
|
|
import cn.hutool.core.map.MapUtil;
|
|
@@ -47,6 +48,8 @@ public class NavEmailParser extends AbstractEmailParser {
|
|
|
|
|
|
private static final int MAX_COLUMN = 20;
|
|
private static final int MAX_COLUMN = 20;
|
|
|
|
|
|
|
|
+ private static final List<String> NOT_CONVERT_FIELD_LIST = ListUtil.toList("TA代码");
|
|
|
|
+
|
|
public NavEmailParser(ValuationEmailParser valuationEmailParser, EmailTemplateService emailTemplateService) {
|
|
public NavEmailParser(ValuationEmailParser valuationEmailParser, EmailTemplateService emailTemplateService) {
|
|
this.valuationEmailParser = valuationEmailParser;
|
|
this.valuationEmailParser = valuationEmailParser;
|
|
this.emailTemplateService = emailTemplateService;
|
|
this.emailTemplateService = emailTemplateService;
|
|
@@ -464,7 +467,7 @@ public class NavEmailParser extends AbstractEmailParser {
|
|
}
|
|
}
|
|
String cellValue = ExcelUtil.getCellValue(cell);
|
|
String cellValue = ExcelUtil.getCellValue(cell);
|
|
// 移除掉非中文字符
|
|
// 移除掉非中文字符
|
|
- String newCellValue = StringUtil.retainChineseCharacters(cellValue);
|
|
|
|
|
|
+ String newCellValue = StringUtil.retainChineseCharacters(cellValue, NOT_CONVERT_FIELD_LIST);
|
|
String field = fieldMatch(newCellValue, emailFieldMap);
|
|
String field = fieldMatch(newCellValue, emailFieldMap);
|
|
if (StrUtil.isNotBlank(field)) {
|
|
if (StrUtil.isNotBlank(field)) {
|
|
List<FieldPositionDTO> fieldPositionDTOList = tempFieldPositionMap.getOrDefault(field, new ArrayList<>());
|
|
List<FieldPositionDTO> fieldPositionDTOList = tempFieldPositionMap.getOrDefault(field, new ArrayList<>());
|