Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java

@@ -134,6 +134,11 @@ public class TbTowerServiceImpl implements TbTowerService {
         }
     }
 
+    /**
+     * 杆塔管理-删除
+     * @param data
+     * @return
+     */
     @Override
     public ServerResponse delTbTower(TbTowerVo data) {
         try {
@@ -145,6 +150,11 @@ public class TbTowerServiceImpl implements TbTowerService {
         }
     }
 
+    /**
+     *杆塔管理导出
+     * @param data
+     * @return
+     */
     @Override
     public List<TbTowerVo> tbProjectExport(TbTowerVo data) {
         List<TbTowerVo> tbTowerVoList = tbTowerMapper.getTbProjectList(data);

src/main/resources/mappers/basic/TbProjectMapper.xml

@@ -82,7 +82,7 @@
         <if test="proStatus != '' and proStatus != null"> and tp.pro_status = #{proStatus}</if>
     </select>
     <select id="getTbProjectById" resultType="com.bonus.digitalSignage.basic.vo.TbProjectVo">
-        select tp.id as id,tp.pro_name as proName,tp.voltage_level as voltageLevel,tp.line_length as lineLength,
+        select tp.id as id,depart_id as departId,tp.pro_name as proName,tp.voltage_level as voltageLevel,tp.line_length as lineLength,
                tp.plan_start_time as planStartTime,tp.plan_end_time as planEndTime,tp.lon as lon,tp.lat as lat,
                tp.address as address,tp.pro_status as pro_status
         from tb_project tp where id = #{id}