|
@@ -241,7 +241,7 @@ public class ExamController extends ControllerSupport {
|
|
|
|
|
|
UserDataRule userDataRule = super.getUserDataRule(DataRuleType.EXAM);
|
|
|
if (userDataRule.assertEmptyQueryResult()) {
|
|
|
- return new PageInfo(new PageImpl<>(new ArrayList<>(), pageable, 0L));
|
|
|
+ return new PageInfo<>(new PageImpl<>(new ArrayList<>(), pageable, 0L));
|
|
|
}
|
|
|
|
|
|
Specification<ExamEntity> specification = (root, query, cb) -> {
|
|
@@ -563,6 +563,7 @@ public class ExamController extends ControllerSupport {
|
|
|
examInfo.setEndTime(domain.getEndTime());
|
|
|
examInfo.setExamTimes(domain.getExamTimes());
|
|
|
examInfo.setExamType(domain.getExamType());
|
|
|
+ examInfo.setCallType(domain.getCallType());
|
|
|
examInfo.setCode(domain.getCode());
|
|
|
examInfo.setName(domain.getName());
|
|
|
examInfo.setRemark(domain.getRemark());
|
|
@@ -610,6 +611,7 @@ public class ExamController extends ControllerSupport {
|
|
|
ed.setEndTime(srcExam.getEndTime());
|
|
|
ed.setExamTimes(srcExam.getExamTimes());
|
|
|
ed.setExamType(srcExam.getExamType());
|
|
|
+ ed.setCallType(srcExam.getCallType());
|
|
|
ed.setRemark(srcExam.getRemark());
|
|
|
ed.setRootOrgId(srcExam.getRootOrgId());
|
|
|
ed.setStarted(isStarted(srcExam.getId()));
|