根据机构ID和考试类型查询所有有效考试批次

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamApi.java

@@ -12,6 +12,7 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,7 @@ import cn.com.qmth.examcloud.common.util.ErrorMsg;
 import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
 import cn.com.qmth.examcloud.service.examwork.entity.Exam;
 import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
+import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
 import cn.com.qmth.examcloud.service.examwork.service.ExamService;
 import cn.com.qmth.examcloud.service.examwork.service.ExamStudentService;
 
@@ -77,7 +79,23 @@ public class ExamApi {
         examCriteria.setEnable(true);
         return new ResponseEntity(examService.getAllExam(examCriteria), HttpStatus.OK);
     }
-
+    
+    
+    @ApiOperation(value="根据机构ID和考试类型查询所有有效考试批次",notes = "根据机构ID和考试类型查询所有有效考试批次")
+    @GetMapping("/exam/rootOrgId/{orgId}/{examType}")
+    public ResponseEntity getEnableExamByRootOrgId(@PathVariable Long orgId,@PathVariable String examType){
+    	if(orgId == null){
+    		return new ResponseEntity(new ErrorMsg("机构ID不能为空"), HttpStatus.OK);
+    	}
+    	Exam examCriteria = new Exam();
+    	examCriteria.setOrgId(orgId);
+    	if(StringUtils.isNotBlank(examType)){
+    		examCriteria.setExamType(ExamType.valueOf(examType));
+    	}
+    	examCriteria.setEnable(true);
+    	return new ResponseEntity(examService.getAllExam(examCriteria), HttpStatus.OK);
+    }
+    
     @ApiOperation(value="查询所有考试批次(包含有效无效)",notes = "不分页带查询")
     @GetMapping("/exam/all/both")
     public ResponseEntity getAllExam(HttpServletRequest request,@ModelAttribute Exam examCriteria){