|
|
@@ -11,6 +11,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.config.JeecgBaseConfig;
|
|
|
+import org.jeecg.modules.projectBudget.entity.ProjectBudget;
|
|
|
+import org.jeecg.modules.projectBudget.service.IProjectBudgetService;
|
|
|
import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
|
|
|
import org.jeecg.modules.projectChbSwf.service.IProjectChbSwfService;
|
|
|
import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
|
|
|
@@ -58,6 +60,9 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
|
|
|
private IProjectChbSwfService swfService;
|
|
|
@Autowired
|
|
|
@SuppressWarnings("all")
|
|
|
+ private IProjectBudgetService budgetService;
|
|
|
+ @Autowired
|
|
|
+ @SuppressWarnings("all")
|
|
|
private JeecgBaseConfig jeecgBaseConfig;
|
|
|
|
|
|
/**
|
|
|
@@ -100,7 +105,7 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
|
|
|
|
|
|
|
|
|
if(projectImportList.getFileType().equals("1")){ //项目预算
|
|
|
- return result;
|
|
|
+ return budgetService.importExcel1(url, ProjectBudget.class);
|
|
|
}else if(projectImportList.getFileType().equals("2")){ //外协费
|
|
|
return wxfService.importExcel1(url, ProjectChbWxf.class);
|
|
|
}else if(projectImportList.getFileType().equals("3")){ //事务费
|
LLL