|
@@ -397,6 +397,7 @@ public class TestCont {
|
|
|
r.setProjectItemName(r.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(r.getProjectItemId()).getName() : null);
|
|
|
r.setProjectItemTargetName(r.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(r.getProjectItemTargetId()).getName() : null);
|
|
|
r.setProjectItemTargetRoomName(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getName() : null);
|
|
|
+ r.setProjectItemTargetRoomNumber(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getRoomNumber() : null);
|
|
|
}
|
|
|
}
|
|
|
return Response.ok(powerDistributionMachines);
|
|
@@ -424,6 +425,7 @@ public class TestCont {
|
|
|
r.setProjectItemName(r.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(r.getProjectItemId()).getName() : null);
|
|
|
r.setProjectItemTargetName(r.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(r.getProjectItemTargetId()).getName() : null);
|
|
|
r.setProjectItemTargetRoomName(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getName() : null);
|
|
|
+ r.setProjectItemTargetRoomNumber(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getRoomNumber() : null);
|
|
|
}
|
|
|
return Response.ok(r);
|
|
|
}
|