fix: 更新任务状态-> 执行结束

This commit is contained in:
taojinlong 2021-08-03 18:58:02 +08:00
parent e4b16b33c3
commit b4a057d46b

View File

@ -4,7 +4,6 @@ import io.dataease.base.domain.*;
import io.dataease.base.mapper.DatasetTableMapper; import io.dataease.base.mapper.DatasetTableMapper;
import io.dataease.base.mapper.DatasetTableTaskMapper; import io.dataease.base.mapper.DatasetTableTaskMapper;
import io.dataease.base.mapper.ext.ExtDataSetTaskMapper; import io.dataease.base.mapper.ext.ExtDataSetTaskMapper;
import io.dataease.base.mapper.ext.UtilMapper;
import io.dataease.base.mapper.ext.query.GridExample; import io.dataease.base.mapper.ext.query.GridExample;
import io.dataease.commons.constants.JobStatus; import io.dataease.commons.constants.JobStatus;
import io.dataease.commons.constants.ScheduleType; import io.dataease.commons.constants.ScheduleType;
@ -93,13 +92,15 @@ public class DataSetTableTaskService {
datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask); datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
} }
scheduleService.addSchedule(datasetTableTask);
// simple // simple
if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { // SIMPLE 类型提前占位 if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { // SIMPLE 类型提前占位
execNow(datasetTableTask); execNow(datasetTableTask);
}else { }else {
checkTaskIsStopped(datasetTableTask); checkTaskIsStopped(datasetTableTask);
} }
scheduleService.addSchedule(datasetTableTask);
return datasetTableTask; return datasetTableTask;
} }