wangliang 4 jaren geleden
bovenliggende
commit
9c072794c9

+ 4 - 8
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -308,15 +308,11 @@ public class TEExamStudentController {
 
             // 获取考场代码和考场名称
             QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
-            tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getOrgId, teExam.getOrgId());
-            List<TBExamInvigilateUser> tbExamInvigilateUserList = tbExamInvigilateUserService
-                    .list(tbExamInvigilateUserQueryWrapper);
+            tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getOrgId, teExam.getOrgId()).eq(TBExamInvigilateUser::getExamId, examId);
+            List<TBExamInvigilateUser> tbExamInvigilateUserList = tbExamInvigilateUserService.list(tbExamInvigilateUserQueryWrapper);
             if (Objects.nonNull(tbExamInvigilateUserList) && tbExamInvigilateUserList.size() > 0) {
-                Map<String, String> tbExamInvigilateUserMap = new HashMap();
-                tbExamInvigilateUserList.forEach(s -> {
-                    tbExamInvigilateUserMap.put(s.getExamId() + ":" + s.getRoomCode() + ":" + s.getRoomName(),
-                            s.getRoomCode() + ":" + s.getRoomName());
-                });
+                Map<String, TBExamInvigilateUser> tbExamInvigilateUserMap = tbExamInvigilateUserList.stream()
+                        .collect(Collectors.toMap(TBExamInvigilateUser::getRoomCode, Function.identity(), (dto1, dto2) -> dto1));
                 transMap.put("tbExamInvigilateUserMap", tbExamInvigilateUserMap);
             }
             transMap.put("remark", tbAttachment.getRemark());

+ 6 - 2
themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -14,7 +14,6 @@ import com.qmth.themis.business.enums.RoleEnum;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.templete.service.TempleteLogicService;
-import com.qmth.themis.common.exception.BusinessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
@@ -173,6 +172,11 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                     teExamStudentUpdateWrapper.lambda().set(TEExamStudent::getName, examStudentImportDto.getName())
                             .eq(TEExamStudent::getIdentity, examStudentImportDto.getIdentity());
                     teExamStudentService.update(teExamStudentUpdateWrapper);
+
+                    ExamCourseCacheBean examCourseCacheBean = teExamCourseService.getExamCourseCacheBean(teExamStudent.getExamId(), teExamStudent.getCourseCode());
+                    if (Objects.nonNull(examCourseCacheBean)) {
+                        teExamStudent.setCourseName(examCourseCacheBean.getCourseName());
+                    }
                     teExamStudentService.saveOrUpdate(teExamStudent);
                     roomCodeAndNameSet.add(examId + ":" + teExamStudent.getRoomCode() + ":" + teExamStudent.getRoomName());
                     teExamStudentList.add(teExamStudent);
@@ -192,7 +196,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
         }
         //考场创建
         if (Objects.nonNull(roomCodeAndNameSet) && roomCodeAndNameSet.size() > 0) {
-            Map<String, String> tbExamInvigilateUserMap = (Map<String, String>) map.get("tbExamInvigilateUserMap");
+            Map<String, TBExamInvigilateUser> tbExamInvigilateUserMap = (Map<String, TBExamInvigilateUser>) map.get("tbExamInvigilateUserMap");
             AtomicInteger count = new AtomicInteger(0);
             roomCodeAndNameSet.forEach(s -> {
                 if (Objects.isNull(tbExamInvigilateUserMap) || (Objects.nonNull(tbExamInvigilateUserMap) && Objects.isNull(tbExamInvigilateUserMap.get(s)))) {