Browse Source

fix: 估值表处理报告出具日期问题优化

chenjianhua 5 months ago
parent
commit
7740b67c9d

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

@@ -37,6 +37,8 @@ public class ValuationBusinessUtils {
 
     private static final String ERROR_MSG_NOT_NUMBER = "非数值数据";
 
+    private static final String VALUATION_TABLE_END = "报表出具日期";
+
     private static final String ERROR_MSG_NOT_MARKET_VALUE_OR_AMOUNT = "无市值列或者无数量列";
 
     public static PreAssetsValuationInfo<PreAssetsValuationBase> importFile(ValuationNeedParseParam valuationNeedParseParam) {
@@ -276,6 +278,9 @@ public class ValuationBusinessUtils {
                         cellValue = removeBlank(cellValue);
                     }
 
+                    if(cellValue.contains(VALUATION_TABLE_END)){
+                        continue;
+                    }
                     // 校验数值
                     if (excelEntity.isNumerical() && isNotNumber(cellValue)) {
                         error = preInfo.new Error();