From b83535eaf37c498464f4916358e643d3edd0ae0d Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 4 Aug 2025 23:54:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbProjectServiceImpl.java    |  1 +
 .../backstage/DigitalSignageMapper.xml        | 20 +++++++++----------
 .../mappers/backstage/ProProgressMapper.xml   | 18 ++++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
index 9a2de57..a88fb9c 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
@@ -72,6 +72,7 @@ public class TbProjectServiceImpl implements TbProjectService {
                     tbProjectVo.setTbThreeSpanVoList(tbThreeSpanVoList);
                     //获取工程下的索道运输
                     tbCablewaTransVo.setProId(tbProjectVo.getId());
+                    tbCablewaTransVo.setSourceType("1");
                     List<TbCablewaTransVo> tbCablewaTransVoList = tbCablewaTransService.tbCablewaTransAll(tbCablewaTransVo);
                     tbProjectVo.setTbCablewaTransVoList(tbCablewaTransVoList);
                 }
diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
index ed34fe9..6bcded0 100644
--- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
+++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
@@ -55,15 +55,15 @@
             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 = 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}
@@ -73,7 +73,7 @@
     <select id="getRopewayTransNum" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM tb_cablewa_trans
-        WHERE pro_id = #{id} AND is_active = '1'
+        WHERE pro_id = #{id} AND (source_type IS NULL OR source_type = '1') AND is_active = '1'
     </select>
     <!--电子看板-三跨数据-->
     <select id="getThreeSpans"
diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml
index 8abac4d..131822d 100644
--- a/src/main/resources/mappers/backstage/ProProgressMapper.xml
+++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml
@@ -151,15 +151,15 @@
             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(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}