|
@@ -9,6 +9,7 @@ import com.platform.dao.dto.project.ProjectDTO;
|
|
import com.platform.dao.dto.sb.SbTypeDTO;
|
|
import com.platform.dao.dto.sb.SbTypeDTO;
|
|
import com.platform.dao.entity.project.Project;
|
|
import com.platform.dao.entity.project.Project;
|
|
import com.platform.dao.entity.sb.SbType;
|
|
import com.platform.dao.entity.sb.SbType;
|
|
|
|
+import com.platform.dao.mapper.project.ProjectMapper;
|
|
import com.platform.dao.util.ExcelUtil;
|
|
import com.platform.dao.util.ExcelUtil;
|
|
import com.platform.dao.util.TreeUtil;
|
|
import com.platform.dao.util.TreeUtil;
|
|
import com.platform.dao.vo.export.project.ExportProjectVO;
|
|
import com.platform.dao.vo.export.project.ExportProjectVO;
|
|
@@ -41,6 +42,7 @@ public class ProjectController {
|
|
private final ProjectService projectService;
|
|
private final ProjectService projectService;
|
|
|
|
|
|
private final SbTypeService sbTypeService;
|
|
private final SbTypeService sbTypeService;
|
|
|
|
+ private final ProjectMapper projectMapper;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 通过id查询单条记录
|
|
* 通过id查询单条记录
|
|
@@ -154,7 +156,12 @@ public class ProjectController {
|
|
*/
|
|
*/
|
|
@GetMapping("tree")
|
|
@GetMapping("tree")
|
|
public R queryTree(ProjectDTO sbTypeDTO) {
|
|
public R queryTree(ProjectDTO sbTypeDTO) {
|
|
- return new R<>(TreeUtil.buildProjectTree(projectService.selectVOList(sbTypeDTO), ""));
|
|
|
|
|
|
+ Project project = new Project();
|
|
|
|
+ project.setName("资产在建类");
|
|
|
|
+ List<Project> projects = projectMapper.select(project);
|
|
|
|
+ List<ProjectVO> projectVOS = projectService.selectVOList(sbTypeDTO);
|
|
|
|
+ projectVOS.add(BeanConverterUtil.copyObjectProperties(projects.get(0),ProjectVO.class));
|
|
|
|
+ return new R<>(TreeUtil.buildProjectTree(projectVOS, ""));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|