diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java index 426b90573e..41cddf3f21 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java @@ -68,6 +68,7 @@ public class ExcelReaderUtil { } public static void main(String[] args) throws Exception { - ExcelReaderUtil.readExcel("根据前100行判断数据类型.xls", new FileInputStream("/Users/taojinlong/Desktop/根据前100行判断数据类型.xls")); + String file ="全国现有确诊趋势.xlsx"; + ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file)); } } diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java index b4d36ec9d8..4419056510 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java @@ -217,15 +217,6 @@ public class ExcelXlsxReader extends DefaultHandler { return; } lastIndex += new String(ch, start, length); - if(curRow==5){ - System.out.println("---------"); - System.out.println(ch); - System.out.println("start: " + start); - System.out.println("length: " + length); - System.out.println(lastIndex); - System.out.println("---------"); - - } } /** @@ -326,7 +317,7 @@ public class ExcelXlsxReader extends DefaultHandler { } else if ("s".equals(cellType)) { //处理字符串 nextDataType = CellDataType.SSTINDEX; } else if ("str".equals(cellType)) { - nextDataType = CellDataType.FORMULA; + nextDataType = CellDataType.SSTINDEX; } String cellStyleStr = attributes.getValue("s"); // diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java index 1fabe5d778..3cb68d14ee 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java @@ -90,6 +90,9 @@ public class DataSetTableTaskService { } datasetTableTaskMapper.insert(datasetTableTask); } else { + datasetTableTask.setStatus(null); + datasetTableTask.setLastExecTime(null); + datasetTableTask.setLastExecStatus(null); datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask); } @@ -197,6 +200,7 @@ public class DataSetTableTaskService { if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){ datasetTableTask.setStatus(TaskStatus.Stopped.name()); }else { + datasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(datasetTableTask.getId()); if(StringUtils.isNotEmpty(datasetTableTask.getEnd()) && datasetTableTask.getEnd().equalsIgnoreCase("1")){ BaseGridRequest request = new BaseGridRequest(); ConditionEntity conditionEntity = new ConditionEntity();