center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 尝试解决导入excle 报找不到字段的问题

Browse Source
This commit is contained in:
taojinlong 2021-08-20 17:32:13 +08:00
parent fecdd28d2d
commit d6c3368d1f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/job/sechedule/Schedular.java
View File

@ -3,9 +3,11 @@ package io.dataease.job.sechedule;
import com.fit2cloud.quartz.anno.QuartzScheduled;
import io.dataease.datasource.service.DatasourceService;
import io.dataease.service.dataset.DataSetTableService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component
public class Schedular {
@Resource
private DataSetTableService dataSetTableService;

6
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -40,7 +40,6 @@ import org.pentaho.di.job.JobMeta;
import org.pentaho.di.job.entries.shell.JobEntryShell;
import org.pentaho.di.job.entries.special.JobEntrySpecial;
import org.pentaho.di.job.entries.success.JobEntrySuccess;
import org.pentaho.di.job.entries.trans.JobEntryTrans;
import org.pentaho.di.job.entry.JobEntryCopy;
import org.pentaho.di.repository.RepositoryDirectoryInterface;
import org.pentaho.di.repository.filerep.KettleFileRepository;
@ -965,7 +964,7 @@ public class ExtractDataService {
outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields);
}else if(datasource.getType().equalsIgnoreCase(DatasourceTypes.excel.name())){
}else if(datasource.getType().equalsIgnoreCase(DatasourceTypes.excel.name())) {
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
for(int i=0;i< datasetTableFields.size();i++){
TextFileField textFileField = new TextFileField();
@ -976,7 +975,6 @@ public class ExtractDataService {
} else {
textFileField.setType("String");
}
outputFields[i] = textFileField;
}
TextFileField textFileField = new TextFileField();
@ -985,7 +983,7 @@ public class ExtractDataService {
outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields);
}{
}else {
textFileOutputMeta.setOutputFields(new TextFileField[0]);
}