【CHG】修改图表查询条件

railway-business/src/main/java/com/railway/business/bi/service/impl/ChartServiceImpl.java

@@ -130,6 +130,11 @@ public class ChartServiceImpl implements IChartService {
       }
       gqFlag.add(bdDto.getGq());
       DlycDTO dlDto = dlycMap.get(bdDto.getGq());
+      if (dlDto.getGq().equals("电力维修队")){
+        dlDto.setDj1(dlyc.getDj1());
+        dlDto.setDj2(dlyc.getDj2());
+        dlDto.setDj3(dlyc.getDj3());
+      }
       List<SeriesDTO> series = listSeries(xAxis, bdDto, dlDto);
       chartList.add(createChartVO(xAxis, series, bdDto.getGq()));
     }
@@ -138,11 +143,6 @@ public class ChartServiceImpl implements IChartService {
       if (gqFlag.contains(dlDto.getGq())) {
         continue;
       }
-      if (dlDto.getGq().equals("电力维修队")){
-        dlDto.setDj1(dlyc.getDj1());
-        dlDto.setDj2(dlyc.getDj2());
-        dlDto.setDj3(dlyc.getDj3());
-      }
       gqFlag.add(dlDto.getGq());
       DlycDTO bdDto = bdycMap.get(dlDto.getGq());
       List<SeriesDTO> series = listSeries(xAxis, bdDto, dlDto);