Skip to content

M
mytime
Commit 3d0b653a authored by Md Suleman's avatar Md Suleman
Browse files
Options

changes in get bench project allocation

parent 2488b53e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/main/java/com/nisum/myteam/service/impl/ResourceService.java
View file @ 3d0b653a
...@@ -583,7 +583,9 @@ public class ResourceService implements IResourceService { ...@@ -583,7 +583,9 @@ public class ResourceService implements IResourceService {
// Active // Active
if (statusFlag.equals(ResourceStatus.ACTIVE.getStatus()) && resource.getStatus().equals(MyTeamUtils.STATUS_ENGAGED)) { if (statusFlag.equals(ResourceStatus.ACTIVE.getStatus()) &&
(resource.getStatus().equals(MyTeamUtils.STATUS_ENGAGED) ||
(resource.getProjectId().equalsIgnoreCase(MyTeamUtils.BENCH_PROJECT_ID) && this.isAllocationActiveToday(resource)))) {
resourceVO.setResourceStatus(ResourceStatus.ACTIVE.getStatus()); resourceVO.setResourceStatus(ResourceStatus.ACTIVE.getStatus());
resourcesList.add(resourceVO); resourcesList.add(resourceVO);
} else if (statusFlag.equals(ResourceStatus.IN_ACTIVE.getStatus()) && resource.getStatus().equals(MyTeamUtils.STATUS_RELEASED)) { } else if (statusFlag.equals(ResourceStatus.IN_ACTIVE.getStatus()) && resource.getStatus().equals(MyTeamUtils.STATUS_RELEASED)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment