From a8cba8ef4d4d8f580e61f137de8b307f2948cba2 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 7 May 2025 14:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DigitalSignageController.java       |  2 +-
 .../backstage/service/DigitalSignageService.java   |  3 +--
 .../service/impl/DigitalSignageServiceImpl.java    |  3 ++-
 .../mappers/backstage/DigitalSignageMapper.xml     | 14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java b/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java
index b0231f0..1572992 100644
--- a/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java
+++ b/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java
@@ -32,7 +32,7 @@ public class DigitalSignageController {
     @PostMapping(value = "getProTree")
     @DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理
     public ServerResponse getProTree(EncryptedReq<QueryParamDto> dto) {
-        return service.getProTree(dto.getData());
+        return service.getProTree();
     }
 
     @ApiOperation("电子看板-杆塔施工进度数量")
diff --git a/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java b/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java
index 8a31d57..33ca9f8 100644
--- a/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java
+++ b/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java
@@ -13,12 +13,11 @@ import com.bonus.digitalSignage.utils.ServerResponse;
 public interface DigitalSignageService {
     /**
      * 电子看板-工程树
-     * @param data
      * @return ServerResponse
      * @author cwchen
      * @date 2025/4/24 10:39
      */
-    ServerResponse getProTree(QueryParamDto data);
+    ServerResponse getProTree();
 
     /**
      * 电子看板-杆塔施工进度数量
diff --git a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java
index d0c2e02..95682ac 100644
--- a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java
+++ b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java
@@ -28,7 +28,8 @@ public class DigitalSignageServiceImpl implements DigitalSignageService {
     private DigitalSignageDao dao;
 
     @Override
-    public ServerResponse getProTree(QueryParamDto dto) {
+    public ServerResponse getProTree() {
+        QueryParamDto dto = new QueryParamDto();
         List<ProTreeVo> tree = new ArrayList<>();
         try {
             List<ProTreeVo> list = Optional.ofNullable(dao.getProTree(dto)).orElseGet(ArrayList::new);
diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
index d766245..11036c6 100644
--- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
+++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
@@ -50,13 +50,13 @@
     <!--电子看板-杆塔施工进度数量-->
     <select id="getTowerProgressNum"
             resultType="com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo$TowerProgressNumVo">
-        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,
+        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 = 0, 1, NULL)) AS num8
         FROM tb_tower WHERE pro_id = #{id} AND is_actvice = '1'
     </select>