估值表优化

service-base/src/main/java/com/simuwang/base/common/util/ValuationBusinessUtils.java

@@ -49,6 +49,11 @@ public class ValuationBusinessUtils {
         PreAssetsValuationInfo<PreAssetsValuationBase>.Error error = null;
 
         File file = valuationNeedParseParam.getFile();
+        if(file != null && file.exists()) {
+            if(file.getAbsolutePath().endsWith(".pdf") || file.getAbsolutePath().endsWith(".PDF")) {
+
+            }
+        }
         assert file != null;
         InputStream inputStream = file2InStream(file);
         Workbook workbook = null;

service-daq/src/main/java/com/simuwang/daq/service/PdfToExcelService.java

@@ -277,7 +277,7 @@ public class PdfToExcelService {
     private void readDateToExcel(Sheet sheet, List<String> lines, Integer rowNumber, WaterMarkEnum waterMark) {
         int baseRowNumber = 0;
         for (int i = 0; i <= sheet.getLastRowNum(); i++) {
-            if ("科目代码".equals(sheet.getRow(i).getCell(0).getStringCellValue())) {
+            if (sheet.getRow(i).getCell(0) != null && "科目代码".equals(sheet.getRow(i).getCell(0).getStringCellValue())) {
                 baseRowNumber = i;
                 break;
             }
@@ -295,7 +295,7 @@ public class PdfToExcelService {
                 //处理空格的问题
                 String cellValue = StrUtil.isBlank(split.get(i1)) ? null : split.get(i1).replace("*", "");
                 //要求为数值的字段,去掉非字符字段
-                if (StrUtil.isNotBlank(cellValue) && NUMBER_FIELD_LIST.contains(sheet.getRow(baseRowNumber).getCell(i1).getStringCellValue())) {
+                if (sheet.getRow(baseRowNumber).getCell(i1) != null && StrUtil.isNotBlank(cellValue) && NUMBER_FIELD_LIST.contains(sheet.getRow(baseRowNumber).getCell(i1).getStringCellValue())) {
                     cellValue = filterNotNumber(cellValue);
                 }
 

service-daq/src/main/java/com/simuwang/daq/service/ValuationEmailParser.java

@@ -136,7 +136,7 @@ public class ValuationEmailParser extends AbstractEmailParser {
 
     private void transformPdfToExcel(ValuationNeedParseParam valuationNeedParseParam) {
         String originFileName = valuationNeedParseParam.getOriginFileName();
-        if (StrUtil.isNotBlank(originFileName) && !ExcelUtil.isPdf(originFileName)) {
+        if (StrUtil.isNotBlank(originFileName) && !ExcelUtil.isPdf(valuationNeedParseParam.getFileUrl())) {
             return;
         }
         File file = valuationNeedParseParam.getFile();