dcs 1 gadu atpakaļ
vecāks
revīzija
e57e90308a

+ 1 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectItemTargetRoomDao.java

@@ -12,6 +12,7 @@ public interface ProjectItemTargetRoomDao {
     ProjectItemTargetRoom get(long id);
 
     List<ProjectItemTargetRoom> getProjectItemTargetRoom(ProjectItemTargetRoom projectItemTargetRoom);
+
     List<ProjectItemTargetRoom> getProjectItemTargetId(long projectItemTargetId);
 
     int getTotalCount(ProjectItemTargetRoom projectItemTargetRoom);

+ 11 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/service/ProjectItemTargetRoomService.java

@@ -131,13 +131,23 @@ public class ProjectItemTargetRoomService {
         return projectItemTargetRoomDao.update(projectItemTargetRoom);
     }
 
+    private List<ProjectItemTargetRoom> getProjectItemTargetId(long targetId) {
+        List<ProjectItemTargetRoom> list = projectItemTargetRoomDao.getProjectItemTargetId(targetId);
+        for (ProjectItemTargetRoom room : list) {
+            room.setProjectName(this.getProject(room.getProjectId()).getName());
+            room.setProjectItemName(this.getProjectItem(room.getProjectItemId()).getName());
+            room.setProjectItemTargetName(this.getProjectItemTarget(room.getProjectItemTargetId()).getName());
+        }
+        return list;
+    }
+
     public Project getLevel(long projectId) {
         Project project = projectDao.getProject(projectId);
         List<ProjectItem> itemList = projectItemDao.getProjectId(project.getId());
         for (ProjectItem item : itemList) {
             List<ProjectItemTarget> targetList = item.getProjectItemTargetList();
             for (ProjectItemTarget target : targetList) {
-                target.setProjectItemTargetRoomList(projectItemTargetRoomDao.getProjectItemTargetId(target.getId()));
+                target.setProjectItemTargetRoomList(this.getProjectItemTargetId(target.getId()));
             }
         }
         project.setProjectItemList(itemList);