|
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
|
|
*/
|
|
*/
|
|
@Component("monthly-report:pdf")
|
|
@Component("monthly-report:pdf")
|
|
public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNavInfo> {
|
|
public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNavInfo> {
|
|
- private final EmailFieldMappingMapper fieldMappingMapper;
|
|
|
|
private final List<Table> extNavTables = ListUtil.list(true);
|
|
private final List<Table> extNavTables = ListUtil.list(true);
|
|
|
|
+ private final EmailFieldMappingMapper fieldMappingMapper;
|
|
private String reportName = null;
|
|
private String reportName = null;
|
|
private Table baseInfoTable = null;
|
|
private Table baseInfoTable = null;
|
|
private List<ValueLabelVO> fieldMapper = null;
|
|
private List<ValueLabelVO> fieldMapper = null;
|
|
@@ -54,7 +54,7 @@ public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNav
|
|
List<String> textList = StrUtil.split(text, "\r\n");
|
|
List<String> textList = StrUtil.split(text, "\r\n");
|
|
if (CollUtil.isNotEmpty(textList)) {
|
|
if (CollUtil.isNotEmpty(textList)) {
|
|
List<String> wkList = this.watermarkListMap.get("report_name");
|
|
List<String> wkList = this.watermarkListMap.get("report_name");
|
|
- String name = this.processString(wkList, textList.get(0) + textList.get(1));
|
|
|
|
|
|
+ String name = this.processString(wkList, textList.get(0));
|
|
this.reportName = this.matchReportName(name);
|
|
this.reportName = this.matchReportName(name);
|
|
if (StrUtil.isBlank(this.reportName)) {
|
|
if (StrUtil.isBlank(this.reportName)) {
|
|
throw new APIException("未匹配到报告名称");
|
|
throw new APIException("未匹配到报告名称");
|