From 4b9f98b9b4184e0824a69470a8f940fd94c245a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Sun, 27 Apr 2025 10:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=B7=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/impl/TbProjectServiceImpl.java | 16 +++++++++++++++-
 .../digitalSignage/basic/vo/TbProjectVo.java     | 10 +++++-----
 2 files changed, 20 insertions(+), 6 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 0054097..9959be7 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
@@ -3,7 +3,9 @@ package com.bonus.digitalSignage.basic.service.impl;
 import com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo;
 import com.bonus.digitalSignage.basic.dao.TbProjectMapper;
 import com.bonus.digitalSignage.basic.service.TbProjectService;
+import com.bonus.digitalSignage.basic.service.TbTowerService;
 import com.bonus.digitalSignage.basic.vo.TbProjectVo;
+import com.bonus.digitalSignage.basic.vo.TbTowerVo;
 import com.bonus.digitalSignage.utils.ServerResponse;
 import com.bonus.digitalSignage.utils.UserUtil;
 import com.bonus.digitalSignage.webResult.StringUtils;
@@ -28,6 +30,9 @@ public class TbProjectServiceImpl implements TbProjectService {
     @Resource
     private TbProjectMapper tbProjectMapper;
 
+    @Resource
+    private TbTowerService tbTowerService;
+
     /**
      * 线路工程管理-查询列表
      * @param data
@@ -36,8 +41,17 @@ public class TbProjectServiceImpl implements TbProjectService {
     @Override
     public ServerResponse getTbProjectList(TbProjectVo data) {
         try {
-
+            //获取工程列表
             List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
+            TbTowerVo tbTowerVo = new TbTowerVo();
+            if (!tbProjectVoList.isEmpty()){
+                for (TbProjectVo tbProjectVo:tbProjectVoList) {
+                    //获取工程下的杆塔列表
+                    tbTowerVo.setProId(tbProjectVo.getId());
+                    List<TbTowerVo> tbTowerVoList = tbTowerService.tbProjectExport(tbTowerVo);
+                    tbProjectVo.setTbTowerVoList(tbTowerVoList);
+                }
+            }
             PageInfo<TbProjectVo> pageInfo = new PageInfo<>(tbProjectVoList);
             return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize());
         } catch (Exception e) {
diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
index d663652..efe6c5e 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
@@ -28,25 +28,25 @@ public class TbProjectVo {
     /**
      * 项目部名称
      */
-    @Excel(name = "项目部名称", sort = 1)
+    @Excel(name = "所属项目部", sort = 1)
     private String departName;
 
     /**
      * 工程名称
      */
-    @Excel(name = "工程名称", sort = 2)
+    @Excel(name = "线路工程名称", sort = 2)
     private String proName;
 
     /**
      * 电压等级（电压等级）
      */
-    @Excel(name = "电压等级（电压等级）", sort = 3)
+    @Excel(name = "电压等级", sort = 3, readConverterExp = "1=110KV,2=220KV")
     private String voltageLevel;
 
     /**
      * 线路长度（单位km）
      */
-    @Excel(name = "线路长度（单位km）", sort = 4)
+    @Excel(name = "线路长度（km）", sort = 4)
     private String lineLength;
 
     /**
@@ -84,7 +84,7 @@ public class TbProjectVo {
     /**
      * 工程状态（字典表配置）
      */
-    @Excel(name = "工程状态（字典表配置）", sort = 8)
+    @Excel(name = "工程状态", sort = 8, readConverterExp = "1=在建,2=完工,3=筹建,4=停工,5=收尾")
     private String proStatus;
 
     /**