....

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -68,7 +68,7 @@ import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
 import cn.com.qmth.examcloud.core.examwork.api.controller.bean.CopyExamDomain;
 import cn.com.qmth.examcloud.core.examwork.api.controller.bean.ExamDomain;
 import cn.com.qmth.examcloud.core.examwork.api.controller.bean.ExamOrgSettingsDomain;
-import cn.com.qmth.examcloud.core.examwork.api.controller.bean.ExamStudentSettingsDomain;
+import cn.com.qmth.examcloud.core.examwork.api.controller.bean.StudentSpecialSettingsDomain;
 import cn.com.qmth.examcloud.core.examwork.base.enums.ExamProperty;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamCourseRelationRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgPropertyRepo;
@@ -1412,12 +1412,12 @@ public class ExamController extends ControllerSupport {
 
 	@ApiOperation(value = "查询考试相关的学生设置", notes = "")
 	@GetMapping("getExamStudentSettingsList/{curPage}/{pageSize}")
-	public PageInfo<ExamStudentSettingsDomain> getExamStudentSettingsList(
+	public PageInfo<StudentSpecialSettingsDomain> getExamStudentSettingsList(
 			@PathVariable Integer curPage, @PathVariable Integer pageSize,
-			@ModelAttribute ExamStudentSettingsDomain examStudentDomain) {
+			@ModelAttribute StudentSpecialSettingsDomain domain) {
 
-		Long examId = examStudentDomain.getExamId();
-		if (null == examStudentDomain.getExamId()) {
+		Long examId = domain.getExamId();
+		if (null == domain.getExamId()) {
 			throw new StatusException("001210", "examId is null");
 		}
 		ExamEntity examEntity = GlobalHelper.getEntity(examRepo, examId, ExamEntity.class);
@@ -1428,19 +1428,19 @@ public class ExamController extends ControllerSupport {
 
 		Specification<ExamSpecialSettingsEntity> specification = (root, query, cb) -> {
 			List<Predicate> predicates = new ArrayList<>();
-			predicates.add(cb.equal(root.get("examId"), examStudentDomain.getExamId()));
+			predicates.add(cb.equal(root.get("examId"), domain.getExamId()));
 			predicates.add(cb.isNull(root.get("courseId")));
 			predicates.add(cb.isNull(root.get("orgId")));
 
-			if (null != examStudentDomain.getStudentId()) {
-				predicates.add(cb.equal(root.get("studentId"), examStudentDomain.getStudentId()));
+			if (null != domain.getStudentId()) {
+				predicates.add(cb.equal(root.get("studentId"), domain.getStudentId()));
 			} else {
 				predicates.add(cb.isNotNull(root.get("studentId")));
 			}
 
-			if (null != examStudentDomain.getIdentityNumber()) {
+			if (null != domain.getIdentityNumber()) {
 				predicates.add(cb.equal(root.get("identityNumber"),
-						examStudentDomain.getIdentityNumber()));
+						domain.getIdentityNumber()));
 			} else {
 				predicates.add(cb.isNotNull(root.get("getIdentityNumber")));
 			}
@@ -1454,11 +1454,11 @@ public class ExamController extends ControllerSupport {
 				pageable);
 
 		Iterator<ExamSpecialSettingsEntity> iterator = page.iterator();
-		List<ExamStudentSettingsDomain> domainList = Lists.newArrayList();
+		List<StudentSpecialSettingsDomain> domainList = Lists.newArrayList();
 
 		while (iterator.hasNext()) {
 			ExamSpecialSettingsEntity next = iterator.next();
-			ExamStudentSettingsDomain bean = new ExamStudentSettingsDomain();
+			StudentSpecialSettingsDomain bean = new StudentSpecialSettingsDomain();
 			domainList.add(bean);
 
 			bean.setBeginTime(next.getBeginTime());
@@ -1472,7 +1472,7 @@ public class ExamController extends ControllerSupport {
 			bean.setIdentityNumber(next.getIdentityNumber());
 		}
 
-		PageInfo<ExamStudentSettingsDomain> ret = new PageInfo<ExamStudentSettingsDomain>();
+		PageInfo<StudentSpecialSettingsDomain> ret = new PageInfo<StudentSpecialSettingsDomain>();
 		ret.setList(domainList);
 		ret.setTotal(page.getTotalElements());
 		return ret;

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/bean/ExamStudentSettingsDomain.java → examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/bean/StudentSpecialSettingsDomain.java

@@ -13,7 +13,7 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @date 2018年5月16日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class ExamStudentSettingsDomain implements JsonSerializable {
+public class StudentSpecialSettingsDomain implements JsonSerializable {
 
 	private static final long serialVersionUID = -3335725218626631530L;