|
@@ -1,10 +1,13 @@
|
|
|
package com.bosshand.virgo.api.service;
|
|
|
|
|
|
import com.bosshand.virgo.api.dao.ProjectDao;
|
|
|
+import com.bosshand.virgo.api.dao.ProjectItemDao;
|
|
|
import com.bosshand.virgo.api.model.Project;
|
|
|
+import com.bosshand.virgo.api.model.ProjectItem;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
@Service
|
|
@@ -13,8 +16,18 @@ public class ProjectService {
|
|
|
@Autowired
|
|
|
private ProjectDao projectDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ProjectItemDao projectItemDao;
|
|
|
+
|
|
|
public Project get(long id) {
|
|
|
- return projectDao.get(id);
|
|
|
+ Project project = projectDao.get(id);
|
|
|
+ List<Long> itemIds = new ArrayList<>();
|
|
|
+ List<ProjectItem> projectItemList = project.getProjectItemList();
|
|
|
+ if (projectItemList != null) {
|
|
|
+ projectItemList.forEach(ls -> itemIds.add(ls.getId()));
|
|
|
+ }
|
|
|
+ project.setProjectItemList(projectItemDao.getIds(itemIds));
|
|
|
+ return project;
|
|
|
}
|
|
|
|
|
|
public int insert(Project project) {
|