diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java index 2cb63faa..28a15541 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -713,12 +713,14 @@ public class ImportExcelServiceImpl extends ServiceImpl analysisStandId(ImportDto importDto) { HashMap result = new HashMap<>(); - if (importDto.getStandId() == null) { + String standId = importDto.getStandId(); + + if (standId == null) { importDto.setErrorStr("标准号为空"); error.add(importDto); return null; } else { - String standId = importDto.getStandId(); +// String standId = importDto.getStandId(); //格式 非空格字符+空格+非空格字符+‘-’或‘—’或空格+年份 如Q/FT F003—2001 Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); if (!pattern.matcher(standId).matches()) { @@ -730,7 +732,7 @@ public class ImportExcelServiceImpl extends ServiceImpl