瀏覽代碼

查堵大屏--bug修复

wangxx 1 月之前
父節點
當前提交
647fb872fd

+ 17 - 1
airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedDashboardServiceImpl.java

@@ -104,7 +104,13 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
104
     public BlockedRateResultDTO getTotalBlockedRate(BlockedDashboardQueryDTO queryDTO) {
104
     public BlockedRateResultDTO getTotalBlockedRate(BlockedDashboardQueryDTO queryDTO) {
105
         BlockedRateResultDTO result = new BlockedRateResultDTO();
105
         BlockedRateResultDTO result = new BlockedRateResultDTO();
106
         BigDecimal totalRate = blockedDashboardMapper.selectTotalBlockedRate(queryDTO);
106
         BigDecimal totalRate = blockedDashboardMapper.selectTotalBlockedRate(queryDTO);
107
-        result.setTotalBlockedRate(totalRate != null ? totalRate : BigDecimal.ZERO);
107
+        // 保留两位小数
108
+        if (totalRate != null) {
109
+            totalRate = totalRate.setScale(2, java.math.RoundingMode.HALF_UP);
110
+        } else {
111
+            totalRate = BigDecimal.ZERO;
112
+        }
113
+        result.setTotalBlockedRate(totalRate);
108
         return result;
114
         return result;
109
     }
115
     }
110
 
116
 
@@ -117,6 +123,16 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
117
     @Override
123
     @Override
118
     public List<BlockedBrigadeRateStatsDTO> getBlockedRateByBrigade(BlockedDashboardQueryDTO queryDTO) {
124
     public List<BlockedBrigadeRateStatsDTO> getBlockedRateByBrigade(BlockedDashboardQueryDTO queryDTO) {
119
         List<BlockedBrigadeRateStatsDTO> resultList = blockedDashboardMapper.selectBlockedRateByBrigade(queryDTO);
125
         List<BlockedBrigadeRateStatsDTO> resultList = blockedDashboardMapper.selectBlockedRateByBrigade(queryDTO);
126
+        if (resultList != null && !resultList.isEmpty()) {
127
+            // 保留两位小数
128
+            for (BlockedBrigadeRateStatsDTO dto : resultList) {
129
+                if (dto.getAvgBlockedRate() != null) {
130
+                    dto.setAvgBlockedRate(dto.getAvgBlockedRate().setScale(2, java.math.RoundingMode.HALF_UP));
131
+                } else {
132
+                    dto.setAvgBlockedRate(BigDecimal.ZERO);
133
+                }
134
+            }
135
+        }
120
         return resultList != null ? resultList : Collections.emptyList();
136
         return resultList != null ? resultList : Collections.emptyList();
121
     }
137
     }
122
 
138
 

+ 2 - 2
airport-blocked/src/main/resources/mapper/blocked/BlockedDashboardMapper.xml

@@ -693,8 +693,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
693
     <select id="selectTerminalBlockedStats" resultType="com.sundot.airport.blocked.dto.BlockedTerminalStatsDTO">
693
     <select id="selectTerminalBlockedStats" resultType="com.sundot.airport.blocked.dto.BlockedTerminalStatsDTO">
694
         SELECT 
694
         SELECT 
695
             COUNT(1) as totalBlockedCount,
695
             COUNT(1) as totalBlockedCount,
696
-            COALESCE(SUM(CASE WHEN terminal_id = 1 THEN 1 ELSE 0 END), 0) as t1BlockedCount,
697
-            COALESCE(SUM(CASE WHEN terminal_id = 2 THEN 1 ELSE 0 END), 0) as t2BlockedCount
696
+            COALESCE(SUM(CASE WHEN terminal_name = 'T1' THEN 1 ELSE 0 END), 0) as t1BlockedCount,
697
+            COALESCE(SUM(CASE WHEN terminal_name = 'T2' THEN 1 ELSE 0 END), 0) as t2BlockedCount
698
         FROM blocked_miss_check_statistics
698
         FROM blocked_miss_check_statistics
699
         WHERE del_flag = '0'
699
         WHERE del_flag = '0'
700
         <if test="brigadeId != null">
700
         <if test="brigadeId != null">