small fixes in effective time period

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

@@ -7,6 +7,7 @@ import com.nisum.myteam.model.dao.EffectiveLoginData;
 import com.nisum.myteam.repository.EffectiveLoginDataRepo;
 import com.nisum.myteam.service.IEffectiveLoginTimeService;
 import com.nisum.myteam.utils.CommomUtil;
+import com.nisum.myteam.utils.MyTeamDateUtils;
 import com.nisum.myteam.utils.MyTeamLogger;
 import com.nisum.myteam.utils.MyTeamUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -93,18 +94,23 @@ public class EffectiveLoginTimeService implements IEffectiveLoginTimeService {
 
     @Override
     public Map<String,Object> getEmployeesEffLoginData(long employeeId, Date fromDate,Date toDate) throws ParseException {
-        List<EffectiveLoginData> loginDataList = effectiveLoginDataRepo.findByDateBetween(fromDate,toDate);
         Map<String,Object> response = new HashMap<>();
-        if(Objects.nonNull(loginDataList) && employeeId != 0){
-            long totalTime = 0;
-            loginDataList.removeIf(effectiveLoginData -> !effectiveLoginData.getEmployeeId().equals(String.valueOf(employeeId)));
-            for(EffectiveLoginData effectiveLoginData:loginDataList) {
-                Date loginTime = MyTeamUtils.tdf.parse(effectiveLoginData.getDurationAtWorkPlace());
-                totalTime += loginTime.getTime();
+        if(fromDate.compareTo(toDate) <= 0) {
+            List<EffectiveLoginData> loginDataList = effectiveLoginDataRepo.findByDateBetween(MyTeamDateUtils.getDayLessThanDate(fromDate),toDate);
+            if (Objects.nonNull(loginDataList) && employeeId != 0) {
+                long totalTime = 0;
+                loginDataList.removeIf(effectiveLoginData -> !effectiveLoginData.getEmployeeId().equals(String.valueOf(employeeId)));
+                for (EffectiveLoginData effectiveLoginData : loginDataList) {
+                    Date loginTime = MyTeamUtils.tdf.parse(effectiveLoginData.getDurationAtWorkPlace());
+                    totalTime += loginTime.getTime();
+                }
+                response.put("averageTime", MyTeamUtils.tdf.format(totalTime / loginDataList.size()));
             }
-            response.put("averageTime",MyTeamUtils.tdf.format(totalTime/loginDataList.size()));
+            response.put("data",loginDataList);
+        }else{
+            response.put("data","Invalid Dates");
         }
-        response.put("data",loginDataList);
+
         return response;
     }