From d952c24666d4581dfc8333f8b5874547f1ae9409 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 25 Jul 2025 16:46:24 +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

---
 .../backstage/DigitalSignageMapper.xml        |  2 +-
 .../mappers/backstage/ProProgressMapper.xml   | 20 +++++++++----------
 .../lineManagement/child/threeSpanFormTemp.js |  5 +++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
index 4489fd6..673a548 100644
--- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
+++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
@@ -133,7 +133,7 @@
         LEFT JOIN (
             SELECT tower_id,next_tower_id
             FROM tb_three_span tts
-            WHERE tts.span_type = '1'
+            WHERE tts.span_type = '1' AND tts.is_active = '1'
             GROUP BY tower_id,next_tower_id
         ) B ON (tt.id = B.tower_id) OR (tt.id = B.next_tower_id)
         LEFT JOIN (
diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml
index 0af79e8..5dff50f 100644
--- a/src/main/resources/mappers/backstage/ProProgressMapper.xml
+++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml
@@ -149,16 +149,16 @@
     <!--查询工程杆塔进度-->
     <select id="getTowerProgress"
             resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo$ProDetailVo">
-        SELECT COUNT(IF(tower_progress &gt;= 1, 1, NULL)) AS num1,
-               COUNT(IF(tower_progress &gt;= 2, 1, NULL)) AS num2,
-               COUNT(IF(tower_progress &gt;= 3, 1, NULL)) AS num3,
-               COUNT(IF(tower_progress &gt;= 4, 1, NULL)) AS num4,
-               COUNT(IF(tower_progress &gt;= 5, 1, NULL)) AS num5,
-               COUNT(IF(tower_progress &gt;= 6, 1, NULL)) AS num6,
-               COUNT(IF(tower_progress &gt;= 7, 1, NULL)) AS num7,
-               COUNT(IF(tower_progress &gt;= 8, 1, NULL)) AS num8,
-               COUNT(IF(tower_progress &gt;= 9, 1, NULL)) AS num9,
-               COUNT(IF(tower_progress &gt;= 10, 1, NULL)) AS num10,
+        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>
diff --git a/src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js b/src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js
index 8f34858..835e674 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js
@@ -284,7 +284,7 @@ function loadTowerOptions() {
     params = {
         encryptedData: encryptCBC(JSON.stringify(params)),
     };
-    ajaxRequest(url, "POST", params, true, null, function (result) {
+    ajaxRequest(url, "POST", params, false, null, function (result) {
         if (result.code === 200) {
             let options = '<option value="">选择杆塔</option>';
             // 保存杆塔列表数据
@@ -314,7 +314,7 @@ function getThreeSpanById() {
         url,
         "POST",
         params,
-        true,
+        false,
         null,
         function (result) {
             layer.close(loadingMsg);
@@ -442,6 +442,7 @@ function setFormData(data) {
             form.render("select");
         }
     }
+    layui.form.render();
 }
 
 function saveData2() {