|
@@ -2284,16 +2284,22 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
dateFlag=false;
|
|
|
}
|
|
|
}
|
|
|
- if(dateFlag){
|
|
|
- if(!dateKeyNames.isEmpty()){
|
|
|
- for (int i = 0; i < dateKeyNames.size(); i++) {
|
|
|
- firstDate=DataInfo.get(dateKeyNames.get(i)).toString();
|
|
|
- firstDate=convertToYMD(firstDate);
|
|
|
- if(StringUtils.isNotEmpty(firstDate)){
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ try {
|
|
|
+ if(dateFlag){
|
|
|
+ if(!dateKeyNames.isEmpty()){
|
|
|
+ for (int i = 0; i < dateKeyNames.size(); i++) {
|
|
|
+ if(DataInfo.get(dateKeyNames.get(i))!=null){
|
|
|
+ firstDate=DataInfo.get(dateKeyNames.get(i)).toString();
|
|
|
+ firstDate=convertToYMD(firstDate);
|
|
|
+ if(StringUtils.isNotEmpty(firstDate)){
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
Elements trs = table.select("tr");
|