FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-09-07 09:52:18 +08:00
parent 9729d04588 6a07bb4325
commit 7471709e1d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
+3 -2
View File
@@ -488,6 +488,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
try { try {
String[] sortAndNumberAndYear = importDto.getStandId().split("\\s+"); String[] sortAndNumberAndYear = importDto.getStandId().split("\\s+");
sort = sortAndNumberAndYear[0]; sort = sortAndNumberAndYear[0];
String[] numberAndYear = sortAndNumberAndYear[1].split("\\-"); String[] numberAndYear = sortAndNumberAndYear[1].split("\\-");
number=numberAndYear[0]; number=numberAndYear[0];
year=numberAndYear[1]; year=numberAndYear[1];
@@ -495,7 +496,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
}catch (Exception e){ }catch (Exception e){
System.out.println("id为"+importDto.getStandId()+"格式无法解析"); System.out.println("id为"+importDto.getStandId()+"格式无法解析");
return null; // return null;
} }
SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); SarStandardsInfo sarStandardsInfo = new SarStandardsInfo();
@@ -613,7 +614,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
}catch (Exception e){ }catch (Exception e){
System.out.println("id为"+importDto.getStandId()+"格式无法解析"); System.out.println("id为"+importDto.getStandId()+"格式无法解析");
return null; // return null;
} }
SarBussionessStand sarBussionessStand = new SarBussionessStand(); SarBussionessStand sarBussionessStand = new SarBussionessStand();