|
@@ -445,7 +445,18 @@ public class ApiController {
|
|
|
Map<String, WmScorePackage> scorePackageMap = wmScorePackages.stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
|
|
|
// 批量查询scoreTaskType
|
|
|
List<Map<String, Object>> scoreTaskTypeCountList = wmScoreTaskTypeMapper.countByScoreId(taskTypeId, scoreIds);
|
|
|
- Map<String, Integer> scoreTaskTypeCountMap = scoreTaskTypeCountList.stream().collect(Collectors.toMap(o -> String.valueOf(o.get("score_id")), o -> Integer.parseInt(String.valueOf(o.get("count")))));
|
|
|
+ Map<String, Integer> scoreTaskTypeCountMap =
|
|
|
+ scoreTaskTypeCountList.stream()
|
|
|
+ .collect(Collectors.toMap(o -> String.valueOf(o.get("score_id")),
|
|
|
+ o -> {
|
|
|
+ String s = String.valueOf(o.get("count"));
|
|
|
+ if ("null".equals(s)){
|
|
|
+ return 0;
|
|
|
+ } else {
|
|
|
+ return Integer.parseInt(s);
|
|
|
+ }
|
|
|
+
|
|
|
+ }));
|
|
|
|
|
|
listMap = new ArrayList<>(statusList.size());
|
|
|
for (WmScorePackageStatus item : statusList) {
|