|
@@ -741,9 +741,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
return R.ok();
|
|
|
}
|
|
|
List<WmTask> taskList=pages.getRecords();
|
|
|
- List<WmScorePackage> taskScorePackages = wmScorePackageService.listByIds(taskList.stream().map(WmTask::getScorePackageId).collect(Collectors.toSet()));
|
|
|
- Map<String, WmScorePackage> scorePackageMap = taskScorePackages.stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
|
|
|
if(!taskList.isEmpty()){
|
|
|
+ List<WmScorePackage> taskScorePackages = wmScorePackageService.listByIds(taskList.stream().map(WmTask::getScorePackageId).collect(Collectors.toSet()));
|
|
|
+ Map<String, WmScorePackage> scorePackageMap = taskScorePackages.stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
|
|
|
List<Map> resList =taskList.stream().map(wmtask -> {
|
|
|
Map map = JSON.parseObject(JSON.toJSONString(wmtask), Map.class);
|
|
|
map.put("reportNo",wmReport.getReportNo());
|