|
|
@@ -602,15 +602,24 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
for (AdminPublicDuration adminPublicDuration : adminPublicDurations) {
|
|
|
String id = adminPublicDuration.getId();
|
|
|
String name = adminPublicDuration.getName();
|
|
|
- double duration = adminPublicDuration.getDuration();
|
|
|
+ // 去掉括号及其内部的内容
|
|
|
+ if (name.contains("(")){
|
|
|
+ int index = name.indexOf('(');
|
|
|
+ name = name.substring(0, index);
|
|
|
+ }else if (name.contains("(")){
|
|
|
+ int index = name.indexOf('(');
|
|
|
+ name = name.substring(0, index);
|
|
|
+ }
|
|
|
|
|
|
+
|
|
|
+ double duration = adminPublicDuration.getDuration();
|
|
|
if (durationMap.containsKey(id)) {
|
|
|
AdminPublicDuration summary = durationMap.get(id);
|
|
|
BigDecimal countDuration = BigDecimal.valueOf(summary.getDuration()).add(BigDecimal.valueOf(duration));
|
|
|
summary.setDuration(countDuration.doubleValue());
|
|
|
summary.setName(name);
|
|
|
summary.setCountNumber(summary.getCountNumber()+1);
|
|
|
- BigDecimal divide = BigDecimal.valueOf(summary.getDuration()).divide(BigDecimal.valueOf(summary.getCountNumber()), 2, RoundingMode.HALF_UP);
|
|
|
+ BigDecimal divide = BigDecimal.valueOf(summary.getDuration()).divide(BigDecimal.valueOf(7.5), 2, RoundingMode.HALF_UP);
|
|
|
summary.setDays(divide.doubleValue());
|
|
|
} else {
|
|
|
durationMap.put(id, new AdminPublicDuration(id, name, duration));
|