|
@@ -175,7 +175,12 @@ public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCU
|
|
|
successData.add("共导入").add(tcUsualScoreList.size() + "").add("条数据");
|
|
|
List<TCUsualScore> tcUsualScoreDbSourceList = tcUsualScoreService.queryUsualScore(cultureProgramId, basicCourse.getId(), paperNumber, examId);
|
|
|
if (!CollectionUtils.isEmpty(tcUsualScoreDbSourceList)) {
|
|
|
- tcUsualScoreList.stream().peek(s -> s.updateExamAndPaperNumberInfo(tcUsualScoreDbSourceList.get(0))).collect(Collectors.toList());
|
|
|
+ Map<String, TCUsualScore> tcUsualScoreDbMap = tcUsualScoreDbSourceList.stream().collect(Collectors.toMap(TCUsualScore::getStudentCode, Function.identity(), (dto1, dto2) -> dto1));
|
|
|
+ tcUsualScoreList.stream().peek(s -> {
|
|
|
+ if (Objects.nonNull(s.getStudentCode()) && tcUsualScoreDbMap.containsKey(s.getStudentCode().trim())) {
|
|
|
+ s.updateExamAndPaperNumberInfo(tcUsualScoreDbMap.get(s.getStudentCode().trim()));
|
|
|
+ }
|
|
|
+ }).collect(Collectors.toList());
|
|
|
}
|
|
|
if (CollectionUtils.isEmpty(tcUsualScoreDbSourceList) || !CollectionUtils.isEqualCollection(tcUsualScoreDbSourceList, tcUsualScoreList)) {
|
|
|
Map<String, TCUsualScore> tcUsualScoreDbMap = tcUsualScoreDbSourceList.stream().collect(Collectors.toMap(TCUsualScore::getStudentCode, Function.identity(), (dto1, dto2) -> dto1));
|