WANG 6 ani în urmă
părinte
comite
c6322d757c

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

@@ -313,7 +313,7 @@ public class ExamController extends ControllerSupport {
 	@ApiOperation(value = "查询考试批次")
 	@GetMapping("queryByNameLike")
 	public List<ExamDomain> query(@RequestParam(required = true) String name,
-			@RequestParam(required = false) String examType,
+			@RequestParam(required = false) String examTypes,
 			@RequestParam(required = false) Boolean enable,
 			@RequestParam(required = false) String propertyKeys,
 			@RequestParam(required = false) Long studentId) {
@@ -327,8 +327,13 @@ public class ExamController extends ControllerSupport {
 			if (null != enable) {
 				predicates.add(cb.equal(root.get("enable"), enable));
 			}
-			if (StringUtils.isNotBlank(examType)) {
-				predicates.add(cb.equal(root.get("examType"), ExamType.valueOf(examType)));
+			if (StringUtils.isNotBlank(examTypes)) {
+				List<String> examTypeList = RegExpUtil.findAll(examTypes, "\\w+");
+				if (10 < examTypeList.size()) {
+					throw new StatusException("E-001120", "too many examTypes");
+				}
+
+				predicates.add(root.get("examType").in(examTypeList));
 			}
 
 			if (null != studentId) {