From b42758696a5a572b8e3b85a7b5f64c674e44ead0 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 18 Jun 2024 21:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BD=9C=E4=B8=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzRiskPredictionController.java | 16 +++++++++++----- src/main/java/com/zhgd/xmgl/task/ExamTask.java | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) 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 1d15767c5..55684e521 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 @@ -109,10 +109,12 @@ public class XzRiskPredictionController { } } } + // 教育培训 + BigDecimal passRadio = examTrainList.stream().map(e -> e.getPassRadio()).reduce(BigDecimal.ZERO, BigDecimal::add); + resultMap.put("exam", new BigDecimal(1).subtract(passRadio.divide(new BigDecimal(examTrainList.size()), 2, BigDecimal.ROUND_HALF_UP))); + } else { + resultMap.put("exam", 0); } - // 教育培训 - BigDecimal passRadio = examTrainList.stream().map(e -> e.getPassRadio()).reduce(BigDecimal.ZERO, BigDecimal::add); - resultMap.put("exam", new BigDecimal(1).subtract(passRadio.divide(new BigDecimal(examTrainList.size()), 2, BigDecimal.ROUND_HALF_UP))); // 安全评分 Double safeScore = list.stream().mapToDouble(e -> e.getSafeScore()).sum(); resultMap.put("safe", new BigDecimal(1).subtract(new BigDecimal(safeScore).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP))); @@ -120,8 +122,12 @@ public class XzRiskPredictionController { List xzSecurityQualityInspectionRecords = xzSecurityQualityInspectionRecordService.list(Wrappers.lambdaQuery() .eq(XzSecurityQualityInspectionRecord::getRecordType, 1) .eq(XzSecurityQualityInspectionRecord::getProjectSn, projectSn)); - long inspectionCount = xzSecurityQualityInspectionRecords.stream().filter(x -> x.getStatus() != 5 && x.getStatus() != 6).count(); - resultMap.put("security", new BigDecimal(inspectionCount).divide(new BigDecimal(xzSecurityQualityInspectionRecords.size()), 2, BigDecimal.ROUND_HALF_UP)); + if (xzSecurityQualityInspectionRecords.size() > 0) { + long inspectionCount = xzSecurityQualityInspectionRecords.stream().filter(x -> x.getStatus() != 5 && x.getStatus() != 6).count(); + resultMap.put("security", new BigDecimal(inspectionCount).divide(new BigDecimal(xzSecurityQualityInspectionRecords.size()), 2, BigDecimal.ROUND_HALF_UP)); + } else { + resultMap.put("security", 0); + } return Result.success(resultMap); } diff --git a/src/main/java/com/zhgd/xmgl/task/ExamTask.java b/src/main/java/com/zhgd/xmgl/task/ExamTask.java index bea7f0fe2..cd893e326 100644 --- a/src/main/java/com/zhgd/xmgl/task/ExamTask.java +++ b/src/main/java/com/zhgd/xmgl/task/ExamTask.java @@ -90,7 +90,7 @@ public class ExamTask { carInfoService.removeByIds(carInfos.stream().map(c -> c.getId()).collect(Collectors.toSet())); for (CarInfo carInfo : carInfos) { //同步海康 - asyncHikvision.carInfoService.deleteCarInfoForHikvision(carInfo, false); + carInfoService.deleteCarInfoForHikvision(carInfo, false); } } }