|
@@ -2017,16 +2017,16 @@ public class WmSupervisionManager {
|
|
|
public Boolean doTaskSupervisionBatch(
|
|
|
WmSupervisionDto.OnTaskSupervisionBatch resource, HnqzUser user) {
|
|
|
|
|
|
- Map<Integer, WmTaskSupervision> task2sup = taskSupervisionService.list(Wrappers.<WmTaskSupervision>lambdaQuery()
|
|
|
- .in(WmTaskSupervision::getTaskId, resource.getSupervisionIds()))
|
|
|
- .stream().collect(Collectors.toMap(WmTaskSupervision::getTaskId, Function.identity()));
|
|
|
+ Map<String, WmTask> id2task = taskService.list(Wrappers.<WmTask>lambdaQuery()
|
|
|
+ .in(WmTask::getId, resource.getSupervisionIds()))
|
|
|
+ .stream().collect(Collectors.toMap(WmTask::getId, Function.identity()));
|
|
|
|
|
|
resource
|
|
|
.getSupervisionIds()
|
|
|
.forEach(
|
|
|
id -> {
|
|
|
OnTaskSupervision single = new WmSupervisionDto.OnTaskSupervision();
|
|
|
- single.setPkgId(task2sup.get(id.intValue()).getPackageId());
|
|
|
+ single.setPkgId(Integer.valueOf(id2task.get(id.toString()).getScorePackageId()));
|
|
|
single.setRemarks(resource.getRemarks());
|
|
|
single.setSupervision(resource.getSupervision());
|
|
|
single.setTaskId(id.intValue());
|