From 2282373b185e47e7141746f0b10ac7ee6a559387 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 20 Aug 2024 18:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/common/entity/bracelet/vo/BaseProject.java | 3 +++
 .../main/java/com/bonus/common/entity/bracelet/vo/GtVo.java   | 4 ++++
 .../com/bonus/bracelet/controller/BraceletController.java     | 1 +
 .../com/bonus/bracelet/controller/EngineeringController.java  | 2 ++
 .../java/com/bonus/bracelet/mapper/EngineeringMapper.java     | 2 +-
 .../src/main/resources/mapper/bracelet/BaseProjectMapper.xml  | 4 +++-
 .../src/main/resources/mapper/bracelet/DeviceMapper.xml       | 3 ++-
 .../src/main/resources/mapper/bracelet/EngineeringMapper.xml  | 4 +++-
 8 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java
index 7bde53d..37da646 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java
@@ -67,4 +67,7 @@ public class BaseProject extends BaseEntity
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private MultipartFile file;
 
+    /** 工程数量 */
+    @Excel(name = "工程数量", cellType = ColumnType.NUMERIC)
+    private int pronum;
 }
diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java
index f3b1e64..1f31f25 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java
@@ -28,6 +28,10 @@ public class GtVo
     @Excel(name = "工程id")
     private long proId;
 
+    /** 班组数量 */
+    @Excel(name = "班组数量")
+    private int teamNum;
+
     /** 杆塔id */
 //    @Excel(name = "杆塔id", cellType = ColumnType.NUMERIC)
     private int gtId;
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java
index 0b5bfde..de7c3eb 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java
@@ -345,4 +345,5 @@ public class BraceletController extends BaseController {
             log.error(e.toString(), e);
         }
     }
+
 }
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EngineeringController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EngineeringController.java
index 5d2a925..b11f795 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EngineeringController.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EngineeringController.java
@@ -12,6 +12,7 @@ import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.common.entity.bracelet.exportVo.EngineeringExportVo;
 import com.bonus.common.entity.bracelet.exportVo.GtExportVo;
+import com.bonus.common.entity.bracelet.vo.AttributeVo;
 import com.bonus.common.entity.bracelet.vo.DeviceVo;
 import com.bonus.common.entity.bracelet.vo.EngineeringVo;
 import com.bonus.common.entity.bracelet.vo.GtVo;
@@ -222,4 +223,5 @@ public class EngineeringController extends BaseController {
             log.error(e.toString(), e);
         }
     }
+
 }
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EngineeringMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EngineeringMapper.java
index 1646da1..24d7319 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EngineeringMapper.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EngineeringMapper.java
@@ -64,7 +64,7 @@ public interface EngineeringMapper {
      * @param vo
      * @return
      */
-       int updateGt(GtVo vo);
+    int updateGt(GtVo vo);
 
      /**
      * 删除杆塔信息
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
index 5eccb35..b591dbd 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
@@ -16,12 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createBy"      column="create_user"     />
 		<result property="delFlag"    column="del_flag"   />
 		<result property="appnum"    column="appnum"   />
+		<result property="pronum"    column="pronum"   />
 	</resultMap>
 
 	<select id="selectProjectList" parameterType="com.bonus.common.entity.bracelet.vo.BaseProject" resultMap="BaseProjectResult">
-		select a.id, depart_name, head_name, contact_information,count(b.source_id) as appnum, remarks,a.create_user,a.update_user
+		select a.id, depart_name, head_name, contact_information,count(b.source_id) as appnum, remarks,a.create_user,a.update_user,count(tp.id) as pronum
 		from tb_project_depart a
 		left join sys_file_source b on a.id = b.source_id and b.source_type = 5 and b.del_flag = 0
+		left join tb_project tp on a.id = tp.depart_id and tp.del_flag = 0
 		<where>
 			a.del_flag = 0
 			<if test="projectDepartName != null and projectDepartName != ''">
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
index bcdd917..6df3f46 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
@@ -41,8 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectDeviceById" parameterType="int" resultType="com.bonus.common.entity.bracelet.vo.DeviceVo">
-        select td.id as deviceId,td.dev_type as deviceType,td.dev_name as deviceName,td.dev_code as deviceCode,td.dev_status as deviceStatus,td.dev_index as deviceIndex
+        select td.id as deviceId,tdd.dict_label AS deviceTypeName,td.dev_name as deviceName,td.dev_code as deviceCode,td.dev_status as deviceStatus,td.dev_index as deviceIndex
         from tb_device td
+        left join sys_dict_data tdd on tdd.dict_value=td.dev_type AND tdd .dict_type='sys_device_type'
         where td.id = #{deviceId}  and td.del_flag = 0
     </select>
 
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
index 965d584..f7fa980 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
@@ -43,8 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!--根据工程id获得杆塔详细信息-->
     <select id="selectGtById" resultType="com.bonus.common.entity.bracelet.vo.GtVo">
-        select tpp.pro_id as proId,tpp.id as gtId,tpp.power_name as gtCode,tpp.lon as lon,tpp.lat as lat
+        select tpp.pro_id as proId,tpp.id as gtId,tpp.power_name as gtCode,tpp.lon as lon,tpp.lat as lat,count(tsb.id) as teamNum
         from  tb_project_power tpp
+        left join tb_sh_box tsb on tpp.id = tsb.gt_id and tsb.team_id is not null and tsb.del_flag = 0
         <where>
             tpp.del_flag = 0
             <if test="proId != null and proId!=''">
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND INSTR(tpp.power_name,#{gtCode}) > 0
             </if>
         </where>
+        group by tpp.pro_id,tpp.id
         order by tpp.id ASC
     </select>