|
@@ -254,6 +254,17 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
|
|
|
if(ExamStatusEnum.CLOSE.equals(existsExam.getStatus())){
|
|
|
throw new BizException("考级项目已关闭");
|
|
|
}
|
|
|
+
|
|
|
+ if(ExamModeEnum.ONLINE.equals(examinationBasic.getExamMode())){
|
|
|
+ examinationBasic.setExamLocationIdList(null);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(examinationBasic.getExamLocationIdList())){
|
|
|
+ List<Integer> organIds = Arrays.stream(examinationBasic.getExamLocationIdList().split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toList());
|
|
|
+ Map<Integer, String> organNameMap = this.getMap("exam_location", "id_", "name_", organIds, Integer.class, String.class);
|
|
|
+ examinationBasic.setExamLocationNameList(StringUtils.join(organNameMap.values(),","));
|
|
|
+ }
|
|
|
+
|
|
|
if(Objects.nonNull(examinationBasic.getEnrollStartTime())
|
|
|
&&examinationBasic.getEnrollStartTime().compareTo(existsExam.getEnrollStartTime())!=0){
|
|
|
if(ExamStatusEnum.EXAM_ING.equals(existsExam.getStatus())||
|