Resource service updates

src/main/java/com/nisum/myteam/service/impl/ResourceService.java

@@ -1067,23 +1067,25 @@ public class ResourceService implements IResourceService {
               benchResource.setEmployeeId(resource.getEmployeeId());
               benchResource.setResourceRole(resource.getResourceRole());
               benchResource.setBillingStartDate(MyTeamDateUtils.getDayMoreThanDate(resource.getBillingEndDate()));
-              if (proposedResource != null) {
-                  benchResource.setBillingEndDate(MyTeamDateUtils.getDayLessThanDate(proposedResource.getBillingStartDate()));
-
-              } else {
-                  benchResource.setBillingEndDate(projectService.getProjectByProjectId(MyTeamUtils.BENCH_PROJECT_ID).getProjectEndDate());
-              }
               benchResource.setBillableStatus(MyTeamUtils.BENCH_BILLABILITY_STATUS);
               benchResource.setStatus(MyTeamUtils.STATUS_RELEASED);
               benchResource.setAuditFields(loginId, MyTeamUtils.CREATE);
-        if(proposedResource!=null &&  existingresource!=null && proposedResource.getBillingStartDate().compareTo(MyTeamDateUtils.getDayMoreThanDate(existingresource.getBillingEndDate()))!=0){
+        if (proposedResource != null) {
+            benchResource.setBillingEndDate(MyTeamDateUtils.getDayLessThanDate(proposedResource.getBillingStartDate()));
+            if( proposedResource.getBillingStartDate().compareTo(MyTeamDateUtils.getDayMoreThanDate(existingresource.getBillingEndDate()))!=0) {
+                resourcePers = resourceRepo.save(benchResource);
+                respMap.put("message", "Resource is moved to Bench Successfully");
+            }else {
+                respMap.put("message", "Resource Released successfully");
+            }
+
+        } else {
+            benchResource.setBillingEndDate(projectService.getProjectByProjectId(MyTeamUtils.BENCH_PROJECT_ID).getProjectEndDate());
             resourcePers = resourceRepo.save(benchResource);
             respMap.put("message", "Resource is moved to Bench Successfully");
-        }else
-            respMap.put("message", "Resource Released successfully");
-        respMap.put("statusCode", 801);
+        }
 
-		  return resourcePers;
+        return resourcePers;
 	}
 
 	@Override