From b1e32f09462eef6397b508610a6cc2f60fd81a6b Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Wed, 19 Jun 2024 11:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/xz/controller/XzRiskPredictionController.java   | 6 ++++--
 .../java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java    | 3 +++
 src/main/java/com/zhgd/xmgl/task/ExamTask.java              | 6 +++++-
 3 files changed, 12 insertions(+), 3 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 55684e521..152d37710 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
@@ -105,7 +105,9 @@ public class XzRiskPredictionController {
                     List<ExamTrainRecord> trainRecordList = examTrainRecordList.stream().filter(e -> e.getTrainId().toString().equals(record.getId().toString())).collect(Collectors.toList());
                     if (trainRecordList.size() > 0) {
                         int pass = trainRecordList.stream().filter(t -> t.getIsPass() == 1).collect(Collectors.toList()).size();
-                        record.setPassRadio(new BigDecimal(pass).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
+                        record.setPassRadio(new BigDecimal(pass).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP));
+                    } else {
+                        record.setPassRadio(new BigDecimal(1));
                     }
                 }
             }
@@ -117,7 +119,7 @@ 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(list.size()), 2, BigDecimal.ROUND_HALF_UP)));
+        resultMap.put("safe", new BigDecimal(1).subtract(new BigDecimal(safeScore).divide(new BigDecimal(100)).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP)));
         // 安全检查隐患
         List<XzSecurityQualityInspectionRecord> xzSecurityQualityInspectionRecords = xzSecurityQualityInspectionRecordService.list(Wrappers.<XzSecurityQualityInspectionRecord>lambdaQuery()
                 .eq(XzSecurityQualityInspectionRecord::getRecordType, 1)
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
index 63f601952..a994ee800 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
@@ -85,6 +85,9 @@ public class XzMaterial implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
+    @ApiModelProperty(value = "是否过期处理")
+    private Integer isDelete;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "企业名称")
     private String enterpriseName;
diff --git a/src/main/java/com/zhgd/xmgl/task/ExamTask.java b/src/main/java/com/zhgd/xmgl/task/ExamTask.java
index cd893e326..008fe25bb 100644
--- a/src/main/java/com/zhgd/xmgl/task/ExamTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/ExamTask.java
@@ -74,15 +74,19 @@ public class ExamTask {
 
     @Scheduled(cron = "0 0/1 * * * ?")
     public void xzMaterial() {
-        List<XzMaterial> list = xzMaterialService.list();
+        List<XzMaterial> list = xzMaterialService.list(Wrappers.<XzMaterial>lambdaQuery().ne(XzMaterial::getIsDelete, 1));
         List<String> carNumber = new ArrayList<>();
+        List<XzMaterial> update = new ArrayList<>();
         for (XzMaterial xzMaterial : list) {
             if (xzMaterial.getEntryEndTime() != null && xzMaterial.getEntryEndTime().compareTo(new Date()) < 0) {
                 if (StringUtils.isNotBlank(xzMaterial.getCarNumber())) {
                     carNumber.add(xzMaterial.getCarNumber());
+                    xzMaterial.setIsDelete(1);
+                    update.add(xzMaterial);
                 }
             }
         }
+        xzMaterialService.updateBatchById(update);
         List<CarInfo> carInfos = carInfoService.list(Wrappers.<CarInfo>lambdaQuery().eq(CarInfo::getCarModuleType, 3));
         if (carInfos.size() > 0) {
             carInfos = carInfos.stream().filter(c -> carNumber.contains(c.getCarNumber())).collect(Collectors.toList());