|
|
@ -100,7 +100,7 @@ public class WarningService { |
|
|
|
if (WarningStatisticQueDto.StatisticType.ENGINEERING.equals(sp.getType())) { |
|
|
|
iPage = warningMapper.statisticByCode(page, sp); |
|
|
|
warningStatisticDto.setStatistics(iPage.getRecords()); |
|
|
|
} else { |
|
|
|
} else if (WarningStatisticQueDto.StatisticType.WARNING_TYPE.equals(sp.getType())) { |
|
|
|
iPage = warningMapper.statisticByWarningType(page, sp); |
|
|
|
warningStatisticDto.setStatistics(iPage.getRecords().stream().peek(item -> { |
|
|
|
SysDictData dictData = dictDataCache.get(new DictKey("xc_warnning_type", item.getCode())); |
|
|
@ -108,6 +108,12 @@ public class WarningService { |
|
|
|
item.setName(dictData.getDictLabel()); |
|
|
|
} |
|
|
|
}).collect(Collectors.toList())); |
|
|
|
} else { |
|
|
|
iPage = warningMapper.statisticByStatus(page, sp); |
|
|
|
warningStatisticDto.setStatistics(iPage.getRecords().stream().peek(item -> { |
|
|
|
item.setName(item.getCode().equals("0") ? "未处理" : "已处理"); |
|
|
|
}).collect(Collectors.toList())); |
|
|
|
|
|
|
|
} |
|
|
|
return warningStatisticDto; |
|
|
|
} |
|
|
|