...

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

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -37,7 +38,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.google.common.collect.Lists;
 
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
-import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.examwork.api.controller.bean.CourseGroupBean;
@@ -85,33 +85,24 @@ public class ExamController extends ControllerSupport {
 	@Autowired
 	CourseGroupRelationRepo courseGroupRelationRepo;
 
-	@Autowired
-	private JdbcTemplate jdbcTemplate;
-
 	@ApiOperation(value = "查询所有考试批次", notes = "分页带查询")
 	@GetMapping("all/{curPage}/{pageSize}")
-	public ResponseEntity getAllExam(HttpServletRequest request, @ModelAttribute Exam examCriteria,
+	public Page<Exam> getAllExam(HttpServletRequest request, @ModelAttribute Exam examCriteria,
 			@PathVariable Integer curPage, @PathVariable Integer pageSize) {
-		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
-		if (accessUser != null) {
-			examCriteria.setOrgId(accessUser.getRootOrgId());
-		} else {
-			return new ResponseEntity(HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity(
-				examService.getAllExam(examCriteria,
-						new PageRequest(curPage, pageSize, new Sort(Direction.DESC, "id"))),
-				HttpStatus.OK);
+		User accessUser = getAccessUser();
+		examCriteria.setRootOrgId(accessUser.getRootOrgId());
+		Page<Exam> page = examService.getAllExam(examCriteria,
+				new PageRequest(curPage, pageSize, new Sort(Direction.DESC, "id")));
+		return page;
 	}
 
 	@ApiOperation(value = "查询所有考试批次(包含有效)", notes = "不分页带查询")
 	@GetMapping("all")
 	public ResponseEntity getEnableExam(HttpServletRequest request,
 			@ModelAttribute Exam examCriteria) {
-		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
-		if (accessUser != null) {
-			examCriteria.setOrgId(accessUser.getRootOrgId());
-		}
+		User accessUser = getAccessUser();
+
+		examCriteria.setRootOrgId(accessUser.getRootOrgId());
 		examCriteria.setEnable(true);
 		return new ResponseEntity(examService.getAllExam(examCriteria), HttpStatus.OK);
 	}
@@ -146,14 +137,11 @@ public class ExamController extends ControllerSupport {
 	}
 
 	@ApiOperation(value = "根据机构ID和考试类型查询所有有效考试批次", notes = "根据机构ID和考试类型查询所有有效考试批次")
-	@GetMapping("rootOrgId/{orgId}/{examType}")
-	public ResponseEntity getEnableExamByRootOrgId(@PathVariable Long orgId,
+	@GetMapping("rootOrgId/{rootOrgId}/{examType}")
+	public ResponseEntity getEnableExamByRootOrgId(@PathVariable Long rootOrgId,
 			@PathVariable String examType) {
-		if (orgId == null) {
-			return new ResponseEntity(new ErrorMsg("机构ID不能为空"), HttpStatus.OK);
-		}
 		Exam examCriteria = new Exam();
-		examCriteria.setOrgId(orgId);
+		examCriteria.setRootOrgId(rootOrgId);
 		if (StringUtils.isNotBlank(examType)) {
 			examCriteria.setExamType(ExamType.valueOf(examType));
 		}
@@ -205,7 +193,6 @@ public class ExamController extends ControllerSupport {
 
 		User accessUser = getAccessUser();
 
-		exam.setOrgId(accessUser.getOrgId());
 		exam.setRootOrgId(accessUser.getRootOrgId());
 		exam.setCanStuDel(true);
 		if (!examService.checkExamName(exam)) {

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

@@ -35,20 +35,18 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 	@ApiOperation(value = "新增考试批次", notes = "新增")
 	@PostMapping
 	@Override
-	public void saveExam(@RequestBody SaveExamReq examReq) {
+	public void saveExam(@RequestBody SaveExamReq req) {
 		Exam exam = new Exam();
-		exam.setName(examReq.getName());
-		exam.setRemark(examReq.getRemark());
-		exam.setDuration(examReq.getDuration());
-		exam.setExamType(ExamType.valueOf(examReq.getExamType()));
-		exam.setBeginTime(examReq.getBeginTime());
-		exam.setEndTime(examReq.getEndTime());
-		// exam.setOrgId(accessUser.getOrgId());
-		exam.setOrgId(109L);
-		// exam.setRootOrgId(accessUser.getRootOrgId());
+		exam.setName(req.getName());
+		exam.setRemark(req.getRemark());
+		exam.setDuration(req.getDuration());
+		exam.setExamType(ExamType.valueOf(req.getExamType()));
+		exam.setBeginTime(req.getBeginTime());
+		exam.setEndTime(req.getEndTime());
+		exam.setRootOrgId(req.getRootOrgId());
 		exam.setCanStuDel(true);
 		if (!examService.checkExamName(exam)) {
-			throw new StatusException("EXAMWORK-EXAMEXSTED", "考试名称已存在,请重新填写");
+			throw new StatusException("E-002001", "考试名称已存在,请重新填写");
 		}
 		examService.insertExam(exam, null);
 	}
@@ -56,9 +54,8 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 	@ApiOperation(value = "根据名称和机构ID查询考试", notes = "根据名称和机构ID查询考试")
 	@PostMapping("/findExam")
 	@Override
-	public GetExamResp getExam(@RequestBody GetExamReq examReq) {
-		Exam exam = examService.findExamByNameAndRootOrgId(examReq.getName(),
-				examReq.getRootOrgId());
+	public GetExamResp getExam(@RequestBody GetExamReq req) {
+		Exam exam = examService.findExamByNameAndRootOrgId(req.getName(), req.getRootOrgId());
 		GetExamResp examResp = new GetExamResp();
 		examResp.setId(exam.getId());
 		examResp.setName(exam.getName());

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/Exam.java

@@ -31,12 +31,6 @@ public class Exam extends JpaEntity {
 	@GeneratedValue
 	private Long id;
 
-	/**
-	 * 机构Id
-	 */
-	@NotNull
-	private Long orgId;
-
 	/**
 	 * 顶级机构Id
 	 */
@@ -242,14 +236,6 @@ public class Exam extends JpaEntity {
 		this.id = id;
 	}
 
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamStudentService.java

@@ -217,7 +217,7 @@ public class ExamStudentService {
 			@Override
 			public ExcelError handle(Object obj) {
 				ExamStudentDTO dto = (ExamStudentDTO) obj;
-				dto.setRootOrgId(exam.getOrgId());
+				dto.setRootOrgId(exam.getRootOrgId());
 				dto.setExam(exam);
 				ExcelError error = importCheck(token, dto);
 				if (error == null) {