diff --git a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java index b7924d3..ec657b7 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java @@ -72,11 +72,14 @@ public class DigitalSignageServiceImpl implements DigitalSignageService { DigitalSignageVo.TowerProgressNumVo vo = new DigitalSignageVo.TowerProgressNumVo(); try { vo = Optional.ofNullable(dao.getTowerProgressNum(dto)).orElseGet(DigitalSignageVo.TowerProgressNumVo::new); + if (vo.getNum11() > 0) { + vo.setNum11(vo.getNum11() - 1); + } // 查询索道运输数量 int num = dao.getRopewayTransNum(dto); vo.setNum12(num); } catch (Exception e) { - log.error(e.toString(),e); + log.error(e.toString(), e); } return ServerResponse.createSuccess(vo); } @@ -98,7 +101,7 @@ public class DigitalSignageServiceImpl implements DigitalSignageService { try { // 查询索道运输信息 List cablewaTransVos = Optional.ofNullable(dao.getCablewaTrans(dto)).orElseGet(ArrayList::new); - if(CollectionUtils.isNotEmpty(cablewaTransVos)){ + if (CollectionUtils.isNotEmpty(cablewaTransVos)) { for (DigitalSignageVo.CablewaTransVo vo : cablewaTransVos) { List cablewaTransPointVos = Optional.ofNullable(dao.getCablewaTransPointVos(vo.getId())).orElseGet(ArrayList::new); vo.setCablewaTransPointVoList(cablewaTransPointVos); @@ -130,7 +133,7 @@ public class DigitalSignageServiceImpl implements DigitalSignageService { map.put("highwayList", highwayList); map.put("aThousandFieldsList", aThousandFieldsList); } catch (Exception e) { - log.error(e.toString(),e); + log.error(e.toString(), e); } return ServerResponse.createSuccess(map); } @@ -141,7 +144,7 @@ public class DigitalSignageServiceImpl implements DigitalSignageService { List towersInfos = Optional.ofNullable(dao.getTowersPosition(dto)).orElseGet(ArrayList::new); return ServerResponse.createSuccess(towersInfos); } catch (Exception e) { - log.error(e.toString(),e); + log.error(e.toString(), e); return ServerResponse.createErroe("查询失败"); } } 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 9a2de57..a88fb9c 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 @@ -72,6 +72,7 @@ public class TbProjectServiceImpl implements TbProjectService { tbProjectVo.setTbThreeSpanVoList(tbThreeSpanVoList); //获取工程下的索道运输 tbCablewaTransVo.setProId(tbProjectVo.getId()); + tbCablewaTransVo.setSourceType("1"); List tbCablewaTransVoList = tbCablewaTransService.tbCablewaTransAll(tbCablewaTransVo); tbProjectVo.setTbCablewaTransVoList(tbCablewaTransVoList); } diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml index ed34fe9..b952cb3 100644 --- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml +++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml @@ -55,13 +55,13 @@ 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 = 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 = 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 = 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 = 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 @@ -73,7 +73,7 @@