|
@@ -577,13 +577,12 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
Map<String, WmTask> taskMap = wmTasks.stream().collect(Collectors.toMap(WmTask::getId, Function.identity()));
|
|
Map<String, WmTask> taskMap = wmTasks.stream().collect(Collectors.toMap(WmTask::getId, Function.identity()));
|
|
|
|
|
|
Set<String> scorePackageIds = wmTasks.stream().map(WmTask::getScorePackageId).collect(Collectors.toSet());
|
|
Set<String> scorePackageIds = wmTasks.stream().map(WmTask::getScorePackageId).collect(Collectors.toSet());
|
|
- if (scorePackageIds.size() > 1) {
|
|
|
|
- throw new RuntimeException("只能处理同一个积分包下的任务");
|
|
|
|
- }
|
|
|
|
|
|
+// if (scorePackageIds.size() > 1) {
|
|
|
|
+// throw new RuntimeException("只能处理同一个积分包下的任务");
|
|
|
|
+// }
|
|
|
|
|
|
// 批量查询积分包
|
|
// 批量查询积分包
|
|
List<WmScorePackage> taskScorePackages = wmScorePackageService.listByIds(scorePackageIds);
|
|
List<WmScorePackage> taskScorePackages = wmScorePackageService.listByIds(scorePackageIds);
|
|
- Map<String, WmScorePackage> scorePackageMap = taskScorePackages.stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
|
|
|
|
|
|
|
|
// 查询企业对应的积分包
|
|
// 查询企业对应的积分包
|
|
Integer reportScorePackageId = queryReport.getScoreId();
|
|
Integer reportScorePackageId = queryReport.getScoreId();
|