MT-150_TeamMateEndDateIsShouldBeUpdateWithTheProjectEndDate (#152)

src/main/java/com/nisum/mytime/controller/ProjectController.java

@@ -85,7 +85,7 @@ public class ProjectController {
 			List<Project> projects = projectRepo.findByAccountId(project.getAccountId());
 			for (Project existproject : projects) {
 				if (project.getProjectName().equalsIgnoreCase(existproject.getProjectName())
-						&& project.getProjectId() != existproject.getProjectId()) {
+						&& !project.getProjectId().equals(existproject.getProjectId())) {
 					projectNameCount++;
 				}
 			}

src/main/java/com/nisum/mytime/service/ProjectServiceImpl.java

@@ -284,6 +284,7 @@ public class ProjectServiceImpl implements ProjectService {
                 emp.setProjectName(projectDB.getProjectName());
                 // MT-79:Maintatin the managerids in List
                 // emp.setManagerIds(projectDB.getManagerIds());
+                emp.setEndDate(projectDB.getProjectEndDate());
                 projectTeamMatesRepo.save(emp);
             }
         }
@@ -703,7 +704,7 @@ public class ProjectServiceImpl implements ProjectService {
 		List<ProjectTeamMate> teamMatesList = new ArrayList<>();
 		List<ProjectTeamMate> teamMates = projectTeamMatesRepo.findByProjectId(projectId);
 		for (ProjectTeamMate projectTeamMate : teamMates) {
-			if (projectTeamMate.getEndDate() != null) {
+			if (projectTeamMate.getEndDate() != null) { 
 				// Active
 				if (statusFlag.equals(MyTimeUtils.ACTIVE) && projectTeamMate.getEndDate().compareTo(new Date()) >= 0)
 					teamMatesList.add(projectTeamMate);