bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
lSun 2025-04-27 10:39:24 +08:00
parent 7c467d2195 4b9f98b9b4
commit 5fad49cc29
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
View File

@ -3,7 +3,9 @@ package com.bonus.digitalSignage.basic.service.impl;
import com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo; import com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo;
import com.bonus.digitalSignage.basic.dao.TbProjectMapper; import com.bonus.digitalSignage.basic.dao.TbProjectMapper;
import com.bonus.digitalSignage.basic.service.TbProjectService; 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.TbProjectVo;
import com.bonus.digitalSignage.basic.vo.TbTowerVo;
import com.bonus.digitalSignage.utils.ServerResponse; import com.bonus.digitalSignage.utils.ServerResponse;
import com.bonus.digitalSignage.utils.UserUtil; import com.bonus.digitalSignage.utils.UserUtil;
import com.bonus.digitalSignage.webResult.StringUtils; import com.bonus.digitalSignage.webResult.StringUtils;
@ -28,6 +30,9 @@ public class TbProjectServiceImpl implements TbProjectService {
@Resource @Resource
private TbProjectMapper tbProjectMapper; private TbProjectMapper tbProjectMapper;
@Resource
private TbTowerService tbTowerService;
/** /**
* 线路工程管理-查询列表 * 线路工程管理-查询列表
* @param data * @param data
@ -36,8 +41,17 @@ public class TbProjectServiceImpl implements TbProjectService {
@Override @Override
public ServerResponse getTbProjectList(TbProjectVo data) { public ServerResponse getTbProjectList(TbProjectVo data) {
try { try {
//获取工程列表
List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data); 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); PageInfo<TbProjectVo> pageInfo = new PageInfo<>(tbProjectVoList);
return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize());
} catch (Exception e) { } catch (Exception e) {

10
src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
View File

@ -28,25 +28,25 @@ public class TbProjectVo {
/** /**
* 项目部名称 * 项目部名称
*/ */
@Excel(name = "项目部名称", sort = 1) @Excel(name = "所属项目部", sort = 1)
private String departName; private String departName;
/** /**
* 工程名称 * 工程名称
*/ */
@Excel(name = "工程名称", sort = 2) @Excel(name = "线路工程名称", sort = 2)
private String proName; private String proName;
/** /**
* 电压等级（电压等级） * 电压等级（电压等级）
*/ */
@Excel(name = "电压等级（电压等级）", sort = 3) @Excel(name = "电压等级", sort = 3, readConverterExp = "1=110KV,2=220KV")
private String voltageLevel; private String voltageLevel;
/** /**
* 线路长度（单位km） * 线路长度（单位km）
*/ */
@Excel(name = "线路长度（单位km）", sort = 4) @Excel(name = "线路长度（km）", sort = 4)
private String lineLength; 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; private String proStatus;
/** /**