|
@@ -187,7 +187,7 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
|
|
|
Double processDelayTime = v.stream().filter(map1 -> map1.get("ddiff") != null).mapToDouble(map1 -> Double.parseDouble(map1.get("ddiff").toString())).sum();
|
|
|
//平均处理时限分钟
|
|
|
int total = (Integer.parseInt(map.get("finishViolationNum").toString()) + Integer.parseInt(map.get("finishDelayNum").toString()));
|
|
|
- map.put("avgMinutes", total == 0 ? 0 : (processViolationTime + processDelayTime) / total);
|
|
|
+ map.put("avgMinutes", total == 0 ? 0 : new BigDecimal(processViolationTime + processDelayTime).divide(new BigDecimal(total), 2, RoundingMode.HALF_UP));
|
|
|
|
|
|
|
|
|
}
|
|
@@ -262,11 +262,11 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
|
|
|
Double processDelayTime = v.stream().filter(map1 -> map1.get("vdiff") != null).mapToDouble(map1 -> Double.parseDouble(map1.get("vdiff").toString())).sum();
|
|
|
//平均处理时限分钟
|
|
|
long total = finishViolationNum + finishDelayNum;
|
|
|
- map.put("avgMinutes", total == 0 ? 0 : (processViolationTime + processDelayTime) / total);
|
|
|
+ map.put("avgMinutes", total == 0 ? 0 : new BigDecimal(processViolationTime + processDelayTime).divide(new BigDecimal(total), 2, RoundingMode.HALF_UP));
|
|
|
//待处理总数数
|
|
|
map.put("pendingProcessing", violationNum + delayNum - total);
|
|
|
//预警均值
|
|
|
- map.put("avgWarn", (violationNum + delayNum) / v.stream().collect(Collectors.groupingBy(map1 -> map1.get("crm_no"))).size());
|
|
|
+ map.put("avgWarn", new BigDecimal(violationNum + delayNum).divide(new BigDecimal(v.stream().collect(Collectors.groupingBy(map1 -> map1.get("crm_no"))).size()), 2, RoundingMode.HALF_UP));
|
|
|
}
|
|
|
|
|
|
/*
|