|
|
@@ -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()));
|