Browse Source

增加获取全部考试批次方法

宋悦 8 năm trước cách đây
mục cha
commit
6cfb6fad3c

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

@@ -60,9 +60,9 @@ public class ExamApi {
     	return new ResponseEntity(examService.getAllExam(examCriteria,new PageRequest(curPage,pageSize)), HttpStatus.OK);
     }
 
-    @ApiOperation(value="查询所有考试批次",notes = "不分页带查询")
+    @ApiOperation(value="查询所有考试批次(包含有效)",notes = "不分页带查询")
     @GetMapping("/exam/all")
-    public ResponseEntity getAllExam(HttpServletRequest request,@ModelAttribute Exam examCriteria){
+    public ResponseEntity getEnableExam(HttpServletRequest request,@ModelAttribute Exam examCriteria){
         AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
         if(accessUser != null){
             examCriteria.setOrgId(accessUser.getRootOrgId());
@@ -71,6 +71,16 @@ public class ExamApi {
         return new ResponseEntity(examService.getAllExam(examCriteria), HttpStatus.OK);
     }
 
+    @ApiOperation(value="查询所有考试批次(包含有效无效)",notes = "不分页带查询")
+    @GetMapping("/exam/all/both")
+    public ResponseEntity getAllExam(HttpServletRequest request,@ModelAttribute Exam examCriteria){
+        AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+        if(accessUser != null){
+            examCriteria.setOrgId(accessUser.getRootOrgId());
+        }
+        return new ResponseEntity(examService.getAllExam(examCriteria), HttpStatus.OK);
+    }
+
     @ApiOperation(value="按ID查询考试批次",notes = "ID查询")
     @GetMapping("/exam/{id}")
     public ResponseEntity<Exam> getExamById(@PathVariable Long id){