diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java index 4081d1b3c..7088c8dbc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java @@ -186,7 +186,8 @@ public class XzRiskPredictionController { } // 安全评分 Double safeScore = list.stream().mapToDouble(e -> e.getSafeScore()).sum(); - resultMap.put("safe", new BigDecimal(1).subtract(new BigDecimal(safeScore).divide(new BigDecimal(100)).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP))); + BigDecimal subtract = new BigDecimal(1).subtract(new BigDecimal(safeScore).divide(new BigDecimal(100)).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP)); + resultMap.put("safe", subtract.setScale(2, BigDecimal.ROUND_HALF_UP)); // 安全检查隐患 List xzSecurityQualityInspectionRecords = xzSecurityQualityInspectionRecordService.list(Wrappers.lambdaQuery() .eq(XzSecurityQualityInspectionRecord::getRecordType, 1) @@ -689,7 +690,8 @@ public class XzRiskPredictionController { } // 安全评分 Double safeScore = list.stream().mapToDouble(e -> e.getSafeScore()).sum(); - resultMap.put("safe", new BigDecimal(1).subtract(new BigDecimal(safeScore).divide(new BigDecimal(100)).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP))); + BigDecimal subtract = new BigDecimal(1).subtract(new BigDecimal(safeScore).divide(new BigDecimal(100)).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP)); + resultMap.put("safe", subtract.setScale(2, BigDecimal.ROUND_HALF_UP)); // 安全检查隐患 List xzSecurityQualityInspectionRecords = allXzSecurityQualityInspectionRecords.stream() .filter(a -> enterpriseIds.contains(a.getEnterpriseId())).collect(Collectors.toList());