【CHG】电力维修队

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

@@ -112,8 +112,6 @@ public class ChartServiceImpl implements IChartService {
 
     List<DlycDTO> bdycList = bdycMapper.totalByDay();
     List<DlycDTO> dlycList = dlycMapper.totalByDay();
-    DlycDTO bdyc = bdycMapper.totalBpdxsdByDay();
-    DlycDTO dlyc = dlycMapper.totalDlwxdByDay();
     Map<String, DlycDTO> bdycMap = bdycList.stream()
         .collect(Collectors.toMap(DlycDTO::getGq, v -> v, (p1, p2) -> p1));
     Map<String, DlycDTO> dlycMap = dlycList.stream()
@@ -123,18 +121,8 @@ public class ChartServiceImpl implements IChartService {
       if (gqFlag.contains(bdDto.getGq())) {
         continue;
       }
-      if (bdDto.getGq().equals("变配电修试队")){
-        bdDto.setDj1(null == bdyc || null == bdyc.getDj1() ? 0 : bdyc.getDj1());
-        bdDto.setDj2(null == bdyc || null == bdyc.getDj2() ? 0 : bdyc.getDj2());
-        bdDto.setDj3(null == bdyc || null == bdyc.getDj3() ? 0 : bdyc.getDj3());
-      }
       gqFlag.add(bdDto.getGq());
       DlycDTO dlDto = dlycMap.get(bdDto.getGq());
-      if (dlDto.getGq().equals("电力维修队")){
-        dlDto.setDj1(null == dlyc || null == dlyc.getDj1() ? 0 : dlyc.getDj1());
-        dlDto.setDj2(null == dlyc || null == dlyc.getDj2() ? 0 : dlyc.getDj2());
-        dlDto.setDj3(null == dlyc || null == dlyc.getDj3() ? 0 : dlyc.getDj3());
-      }
       List<SeriesDTO> series = listSeries(xAxis, bdDto, dlDto);
       chartList.add(createChartVO(xAxis, series, bdDto.getGq()));
     }

railway-business/src/main/resources/mapper/bi/ShowDlycMapper.xml

@@ -266,7 +266,7 @@
           where del_flag = '0'
             and rectify_result='未处理'
             and file_id = (select max(id) from show_file where data_type = 'yctj' and imp_result = '1')
-            and ssgq = '电力维修队'
+            and ssgq is not null
           ) x
           right join sys_dict_data t1 on x.ssgq = t1.dict_label
     where t1.dict_type = 'dlyc_sygq'
@@ -284,9 +284,9 @@
           from show_dlyc
           where del_flag = '0' and found_mode = '0'
             and rectify_result='未处理'
-            and file_id =
-                (select max(id) from show_file where data_type = 'yctj' and imp_result = '1')
-            and ssgq is not null) x
+            and file_id = (select max(id) from show_file where data_type = 'yctj' and imp_result = '1')
+            and ssgq = '电力维修队'
+          ) x
   </select>
 
   <resultMap id="TotalResultMap" type="com.railway.business.bi.domain.vo.YcxxTotalVO">