From eb4e39fe139e705bfc1f32053390477f9804efba Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sun, 12 May 2024 15:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java  | 1 +
 .../service/impl/DangerousEngineeringRecordServiceImpl.java   | 2 +-
 .../service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java | 3 ++-
 ...zSecurityXzSecurityQualityInspectionRecordServiceImpl.java | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java
index 7fef19182..ca5fdac9a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @DataScope
 public interface CarInfoMapper extends BaseMapper<CarInfo> {
 
+    @DataScope(includeTable = "car_info")
     List<EntityMap> selectCarList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
 
     List<Map<String, Object>> selectCarTypeCount(Map<String, Object> map);
diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
index 74a5ab9ee..ef34aaed8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
@@ -210,6 +210,6 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
             result2 = result2.multiply(new BigDecimal(0.4)).setScale(2, RoundingMode.HALF_UP);
             total = result1.add(result2);
         }
-        return total.multiply(new BigDecimal(15));
+        return total.multiply(new BigDecimal(15)).setScale(2, RoundingMode.HALF_UP);
     }
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
index a6efdc9ef..63f30a6ba 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
@@ -64,6 +64,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -631,7 +632,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
         BigDecimal subtract = bigDecimal1.subtract(bigDecima);
         subtract = subtract.divide(bigDecima, 2, BigDecimal.ROUND_HALF_UP);
         BigDecimal subtract1 = bigDecimal2.subtract(subtract);
-        return subtract1.multiply(new BigDecimal(20));
+        return subtract1.multiply(new BigDecimal(20)).setScale(2, RoundingMode.HALF_UP);
     }
 
     private Integer getAlarmType(Integer algorithmId) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java
index cfa38ec39..d3e6901aa 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java
@@ -684,7 +684,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
             BigDecimal result4 = bigDecimal6.divide(bigDecimal7, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.2)).setScale(2, RoundingMode.HALF_UP);
 
             BigDecimal total = result1.add(result2).add(result3).add(result4);
-            return total.multiply(new BigDecimal(25));
+            return total.multiply(new BigDecimal(25)).setScale(2, RoundingMode.HALF_UP);
         }
         return new BigDecimal(25);
     }
@@ -708,7 +708,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
             result2 = new BigDecimal(0.01);
         }
         BigDecimal total = result1.add(result2);
-        return total.multiply(new BigDecimal(15));
+        return total.multiply(new BigDecimal(15)).setScale(2, RoundingMode.HALF_UP);
     }
 
     private void recoverScore(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) {