Modified the code for shift details

src/main/java/com/nisum/myteam/schedular/ProjectEndDateScheduler.java

@@ -7,7 +7,6 @@ import com.nisum.myteam.model.dao.Project;
 import com.nisum.myteam.service.IEmployeeService;
 import com.nisum.myteam.service.IMailService;
 import com.nisum.myteam.service.IProjectService;
-import com.nisum.myteam.utils.DateUtils;
 import com.nisum.myteam.utils.MyTeamDateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -592,24 +592,25 @@ public class ResourceAllocationService implements IResourceAllocationService {
 //
 //                    }
 
+                    if (resource.getBillingEndDate().compareTo(new Date()) >= 0) {
+                        Employee employee = employeeService.getEmployeeById(resource.getEmployeeId());
+
+                        EmployeeShiftsVO shiftsVO = new EmployeeShiftsVO();
+                        shiftsVO.setEmployeeId(employee.getEmployeeId());
+                        shiftsVO.setEmployeeName(employee.getEmployeeName());
+                        shiftsVO.setEmailId(employee.getEmailId());
+                        shiftsVO.setMobileNo(employee.getMobileNumber());
+                        shiftsVO.setProjectName(project.getProjectName());
+
+                        if (employee != null) {
+                            if (shift.equalsIgnoreCase(employee.getShift()))
+                                resourcesList.add(shiftsVO);
+                            else if (employee.getShift() == null && Shifts.SHIFT1.getShiftType().equalsIgnoreCase(shift))
+                                resourcesList.add(shiftsVO);
 
-                    Employee employee = employeeService.getEmployeeById(resource.getEmployeeId());
-
-                    EmployeeShiftsVO shiftsVO = new EmployeeShiftsVO();
-                    shiftsVO.setEmployeeId(employee.getEmployeeId());
-                    shiftsVO.setEmployeeName(employee.getEmployeeName());
-                    shiftsVO.setEmailId(employee.getEmailId());
-                    shiftsVO.setMobileNo(employee.getMobileNumber());
-                    shiftsVO.setProjectName(project.getProjectName());
-
-                    if (employee != null) {
-                        if (shift.equalsIgnoreCase(employee.getShift()))
-                            resourcesList.add(shiftsVO);
-
-                        else if (employee.getShift() == null && Shifts.SHIFT1.getShiftType().equalsIgnoreCase(shift))
-                            resourcesList.add(shiftsVO);
-
+                        }
                     }
+
                 }//for
             }
 

src/main/java/com/nisum/myteam/utils/DateUtils.java

-package com.nisum.myteam.utils;
-
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Calendar;
-import java.util.Date;
-
-@Slf4j
-public class DateUtils {
-
-
-}

src/main/java/com/nisum/myteam/utils/MyTeamDateUtils.java

@@ -32,9 +32,9 @@ public class MyTeamDateUtils {
         return yesterday;
     }
 
-    public static void main(String[] args)
-    {
-        MyTeamDateUtils.getDayLessThanDate(new Date());
-    }
+    //public static void main(String[] args)
+    //{
+       // MyTeamDateUtils.getDayLessThanDate(new Date());
+   // }
 
 }