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

问题修复

This commit is contained in:
cwchen 2025-08-04 23:54:46 +08:00
parent f2ef05d06e
commit b83535eaf3
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,7 @@ public class TbProjectServiceImpl implements TbProjectService {
tbProjectVo.setTbThreeSpanVoList(tbThreeSpanVoList);
//获取工程下的索道运输
tbCablewaTransVo.setProId(tbProjectVo.getId());
tbCablewaTransVo.setSourceType("1");
List<TbCablewaTransVo> tbCablewaTransVoList = tbCablewaTransService.tbCablewaTransAll(tbCablewaTransVo);
tbProjectVo.setTbCablewaTransVoList(tbCablewaTransVoList);
}

20
src/main/resources/mappers/backstage/DigitalSignageMapper.xml
View File

@ -55,15 +55,15 @@
resultType="com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo$TowerProgressNumVo">
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 >= 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress >= 9, 1, NULL)) AS num9,
COUNT(IF(tower_progress >= 10, 1, NULL)) AS num10,
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 = 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress = 9, 1, NULL)) AS num9,
COUNT(IF(tower_progress = 10, 1, NULL)) AS num10,
COUNT(IF(tower_progress = 0, 1, NULL)) AS num11
FROM tb_tower
WHERE pro_id = #{id}
@ -73,7 +73,7 @@
<select id="getRopewayTransNum" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM tb_cablewa_trans
WHERE pro_id = #{id} AND is_active = '1'
WHERE pro_id = #{id} AND (source_type IS NULL OR source_type = '1') AND is_active = '1'
</select>
<!--电子看板-三跨数据-->
<select id="getThreeSpans"

18
src/main/resources/mappers/backstage/ProProgressMapper.xml
View File

@ -151,15 +151,15 @@
resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo$ProDetailVo">
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 >= 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress >= 9, 1, NULL)) AS num9,
COUNT(IF(tower_progress >= 10, 1, NULL)) AS num10,
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 = 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress = 9, 1, NULL)) AS num9,
COUNT(IF(tower_progress = 10, 1, NULL)) AS num10,
COUNT(*) AS towerNum
FROM tb_tower
WHERE pro_id = #{id}