Skip to content

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

Updated status propesed in resource response

parent 3f3ed5bd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/main/java/com/nisum/myteam/service/impl/ResourceService.java
View file @ dc2783ce
......@@ -500,7 +500,8 @@ public class ResourceService implements IResourceService {
// Active
if (statusFlag.equals(ResourceStatus.ACTIVE.getStatus()) && billingEndDate.compareTo(new Date()) >= 0) {
if (statusFlag.equals(ResourceStatus.ACTIVE.getStatus()) && billingEndDate.compareTo(new Date()) >= 0 &&
!resource.getStatus().equals(MyTeamUtils.STATUS_PROPOSED)) {
resourceVO.setResourceStatus(ResourceStatus.ACTIVE.getStatus());
resourcesList.add(resourceVO);
} else if (statusFlag.equals(ResourceStatus.IN_ACTIVE.getStatus()) && billingEndDate.compareTo(new Date()) < 0) {
......
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