|
@@ -109,6 +109,9 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
|
|
|
examinationBasic.getName(),
|
|
|
examinationBasic.getName()
|
|
|
);
|
|
|
+ examRegistrationPayment.setTransNo((String) payMap.get("routingMerNos"));
|
|
|
+ examRegistrationPayment.setPayType((String) payMap.get("type"));
|
|
|
+ examRegistrationPaymentService.update(examRegistrationPayment);
|
|
|
return payMap;
|
|
|
}
|
|
|
|
|
@@ -165,7 +168,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
|
|
|
dataList = examRegistrationDao.queryStudentList(params);
|
|
|
List<Integer> subjectIds = dataList.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
|
|
|
Map<Integer, String> subjectNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
|
|
|
- dataList.forEach(e->{
|
|
|
+ dataList.forEach(e -> {
|
|
|
e.setSubjectName(subjectNameMap.get(e.getSubjectId()));
|
|
|
});
|
|
|
}
|
|
@@ -194,7 +197,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
|
|
|
Map<Integer, String> subjectNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
|
|
|
Map<Integer, String> examNameMap = this.getMap("examination_basic", "id_", "name_", basicIds, Integer.class, String.class);
|
|
|
Map<Integer, String> certificationNameMap = this.getMap("exam_certification", "exam_registration_id_", "card_no_", registrationIds, Integer.class, String.class);
|
|
|
- dataList.forEach(e->{
|
|
|
+ dataList.forEach(e -> {
|
|
|
e.setSubjectName(subjectNameMap.get(e.getSubjectId()));
|
|
|
e.setSubjectName(examNameMap.get(e.getExaminationBasicId()));
|
|
|
e.setSubjectName(certificationNameMap.get(e.getId()));
|