From eb3a0172d43ac5d5f37bb8f4a59cb3e394e587e8 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 4 Aug 2025 13:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml
index 5dff50f..8abac4d 100644
--- a/src/main/resources/mappers/backstage/ProProgressMapper.xml
+++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml
@@ -149,18 +149,21 @@
     <!--查询工程杆塔进度-->
     <select id="getTowerProgress"
             resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo$ProDetailVo">
-        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
+            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="getUpdateRecord"