|
|
@@ -160,15 +160,15 @@ public class InternshipPlanManageParticipantServiceImpl extends MPJBaseServiceIm
|
|
|
.eq(InternshipPlanManageParticipant::getInternshipPlanManageId, dto.getInternshipPlanManageId())
|
|
|
.eq(InternshipPlanManageParticipant::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
);
|
|
|
- Set<Long> selectedStudents = participantList.stream().map(InternshipPlanManageParticipant::getParticipantUserId).collect(Collectors.toSet());
|
|
|
-
|
|
|
+ Map<Long, String> collect = participantList.stream().collect(Collectors.toMap(InternshipPlanManageParticipant::getParticipantUserId, InternshipPlanManageParticipant::getResult));
|
|
|
PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = ConventPage.getPageOutput(mobilePage, InternshipPlanManageParticipantPageVo.class);
|
|
|
for (InternshipPlanManageParticipantPageVo vo : pageOutput.getList()) {
|
|
|
- if(selectedStudents.contains(vo.getId())){
|
|
|
+ if(collect.containsKey(vo.getId())){
|
|
|
vo.setIsSelected(1);
|
|
|
}else{
|
|
|
vo.setIsSelected(0);
|
|
|
}
|
|
|
+ vo.setEvaluateResult(collect.get(vo.getId()));
|
|
|
}
|
|
|
return pageOutput;
|
|
|
}
|