소스 검색

使用报表

chenshudong 3 주 전
부모
커밋
a2169deb4b
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemLargeScreenServiceImpl.java

+ 2 - 1
airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemLargeScreenServiceImpl.java

@@ -287,7 +287,8 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
287 287
             return null;
288 288
         }
289 289
         seizureModule.setTotalForm((int) dataList.stream().map(SysUsageReportSeizureDto::getId).distinct().count());
290
-        seizureModule.setTotalFormArchived((int) dataList.stream().filter(d -> StrUtil.equals("3", d.getProcessStatus())).map(SysUsageReportSeizureDto::getId).distinct().count());
290
+        dataList = dataList.stream().filter(d -> StrUtil.equals("3", d.getProcessStatus())).collect(Collectors.toList());
291
+        seizureModule.setTotalFormArchived((int) dataList.stream().map(SysUsageReportSeizureDto::getId).distinct().count());
291 292
         seizureModule.setTotalSeizure(dataList.stream().map(SysUsageReportSeizureDto::getTotal).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
292 293
         seizureModule.setSeizureTypeList(convertAndGroupByField(dataList, d -> d.getCategoryCode() + "###" + d.getCategoryName()));
293 294
         seizureModule.setSeizurePositionList(convertAndGroupByField(dataList, d -> d.getPositionCode() + "###" + d.getPositionName()));