wangliang 1 天之前
父節點
當前提交
76a0dc206e

+ 6 - 1
teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TCFinalScoreServiceImpl.java

@@ -233,7 +233,12 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
                     successData.add("共导入").add(tcFinalScoreList.size() + "").add("条数据");
                     List<TCFinalScore> tcFinalScoreDbSourceList = tcFinalScoreService.queryFinalScore(cultureProgramId, courseId, paperNumber, examId);
                     if (!CollectionUtils.isEmpty(tcFinalScoreDbSourceList)) {
-                        tcFinalScoreList.stream().peek(s -> s.updateExamAndPaperNumberInfo(tcFinalScoreDbSourceList.get(0))).collect(Collectors.toList());
+                        Map<String, TCFinalScore> tcUsualScoreDbMap = tcFinalScoreDbSourceList.stream().collect(Collectors.toMap(TCFinalScore::getStudentCode, Function.identity(), (dto1, dto2) -> dto1));
+                        tcFinalScoreList.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(tcFinalScoreDbSourceList) || !CollectionUtils.isEqualCollection(tcFinalScoreDbSourceList, tcFinalScoreList)) {
                         Map<String, TCFinalScore> tcUsualScoreDbMap = tcFinalScoreDbSourceList.stream().collect(Collectors.toMap(TCFinalScore::getStudentCode, Function.identity(), (dto1, dto2) -> dto1));

+ 6 - 1
teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TCUsualScoreServiceImpl.java

@@ -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));