Commit 7e3df43f authored by Md Suleman's avatar Md Suleman

small fixes in effective time period

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