From 89d469773818ec7a121aed6291887da53aeaa916 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 4 Aug 2025 15:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backstage/DigitalSignageMapper.xml        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
index d25dd19..39a6637 100644
--- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
+++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
@@ -53,18 +53,21 @@
     <!--电子看板-杆塔施工进度数量-->
     <select id="getTowerProgressNum"
             resultType="com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo$TowerProgressNumVo">
-        SELECT COUNT(IF(tower_progress = 1, 1, NULL)) AS num1,
-               COUNT(IF(tower_progress = 2, 1, NULL)) AS num2,
-               COUNT(IF(tower_progress = 3, 1, NULL)) AS num3,
-               COUNT(IF(tower_progress = 4, 1, NULL)) AS num4,
-               COUNT(IF(tower_progress = 5, 1, NULL)) AS num5,
-               COUNT(IF(tower_progress = 6, 1, NULL)) AS num6,
-               COUNT(IF(tower_progress = 7, 1, NULL)) AS num7,
-               COUNT(IF(tower_progress = 8, 1, NULL)) AS num8,
-               COUNT(IF(tower_progress = 9, 1, NULL)) AS num9,
-               COUNT(IF(tower_progress = 10, 1, NULL)) AS num10,
-               COUNT(IF(tower_progress = 0, 1, NULL)) AS num11
-        FROM tb_tower WHERE pro_id = #{id} AND is_actvice = '1'
+        SELECT
+            COUNT(IF(tower_progress >= 1, 1, NULL)) AS num1,
+            COUNT(IF(tower_progress >= 2, 1, NULL)) AS num2,
+            COUNT(IF(tower_progress >= 3, 1, NULL)) AS num3,
+            COUNT(IF(tower_progress >= 4, 1, NULL)) AS num4,
+            COUNT(IF(tower_progress >= 5, 1, NULL)) AS num5,
+            COUNT(IF(tower_progress >= 6, 1, NULL)) AS num6,
+            COUNT(IF(tower_progress >= 7, 1, NULL)) AS num7,
+            COUNT(IF(tower_progress >= 8, 1, NULL)) AS num8,
+            COUNT(IF(tower_progress >= 9, 1, NULL)) AS num9,
+            COUNT(IF(tower_progress >= 10, 1, NULL)) AS num10,
+            COUNT(*) AS towerNum
+        FROM tb_tower
+        WHERE pro_id = #{id}
+          AND is_actvice = '1'
     </select>
     <!--查询索道运输数量-->
     <select id="getRopewayTransNum" resultType="java.lang.Integer">