|
|
@@ -653,9 +653,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
if (summary.getConversion()!=null){
|
|
|
BigDecimal divide = BigDecimal.valueOf(summary.getDuration()).divide(BigDecimal.valueOf(summary.getConversion()), 2, RoundingMode.HALF_UP);
|
|
|
summary.setDays(divide.doubleValue());
|
|
|
- System.out.println(name+":"+summary.getDuration()+"/"+summary.getConversion()+"="+divide);
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
AdminPublicDuration e = new AdminPublicDuration(id, name, duration);
|
|
|
e.setWorkingHours(adminPublicDuration.getWorkingHours());
|
|
|
@@ -670,13 +668,10 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
if (e.getConversion()!=null){
|
|
|
BigDecimal divide = BigDecimal.valueOf(e.getDuration()).divide(BigDecimal.valueOf(e.getConversion()), 2, RoundingMode.HALF_UP);
|
|
|
e.setDays(divide.doubleValue());
|
|
|
- System.out.println(name+":"+e.getDuration()+"/"+e.getConversion()+"="+divide);
|
|
|
}
|
|
|
durationMap.put(id, e);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
return new ArrayList<>(durationMap.values());
|
|
|
}
|
|
|
|