|
@@ -4,7 +4,6 @@ import cn.com.qmth.print.manage.entity.ExamStudentEntity;
|
|
import cn.com.qmth.print.manage.enums.GroupType;
|
|
import cn.com.qmth.print.manage.enums.GroupType;
|
|
import cn.com.qmth.print.manage.enums.RecordStatus;
|
|
import cn.com.qmth.print.manage.enums.RecordStatus;
|
|
import cn.com.qmth.print.manage.service.ExamStudentService;
|
|
import cn.com.qmth.print.manage.service.ExamStudentService;
|
|
-import cn.com.qmth.print.manage.utils.result.ResultUtil;
|
|
|
|
import com.qmth.boot.api.constant.ApiConstant;
|
|
import com.qmth.boot.api.constant.ApiConstant;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
@@ -50,7 +49,8 @@ public class ConditionController {
|
|
/**
|
|
/**
|
|
* 准考证列表
|
|
* 准考证列表
|
|
*
|
|
*
|
|
- * @param examId 批次ID
|
|
|
|
|
|
+ * @param examId
|
|
|
|
+ * 批次ID
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/list_exam_number", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/list_exam_number", method = RequestMethod.POST)
|
|
@@ -58,7 +58,8 @@ public class ConditionController {
|
|
List<ExamStudentEntity> studentEntityList = examStudentService.listByExamId(examId);
|
|
List<ExamStudentEntity> studentEntityList = examStudentService.listByExamId(examId);
|
|
List<String> examNumberList = new ArrayList<>();
|
|
List<String> examNumberList = new ArrayList<>();
|
|
if (!CollectionUtils.isEmpty(studentEntityList)) {
|
|
if (!CollectionUtils.isEmpty(studentEntityList)) {
|
|
- examNumberList = studentEntityList.stream().map(m -> m.getExamNumber()).distinct().collect(Collectors.toList());
|
|
|
|
|
|
+ examNumberList = studentEntityList.stream().map(m -> m.getExamNumber()).distinct()
|
|
|
|
+ .collect(Collectors.toList());
|
|
}
|
|
}
|
|
return examNumberList;
|
|
return examNumberList;
|
|
}
|
|
}
|
|
@@ -66,7 +67,8 @@ public class ConditionController {
|
|
/**
|
|
/**
|
|
* 科目列表
|
|
* 科目列表
|
|
*
|
|
*
|
|
- * @param examId 批次ID
|
|
|
|
|
|
+ * @param examId
|
|
|
|
+ * 批次ID
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/list_course_code", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/list_course_code", method = RequestMethod.POST)
|
|
@@ -74,7 +76,8 @@ public class ConditionController {
|
|
List<ExamStudentEntity> studentEntityList = examStudentService.listByExamId(examId);
|
|
List<ExamStudentEntity> studentEntityList = examStudentService.listByExamId(examId);
|
|
List<String> courseCodeList = new ArrayList<>();
|
|
List<String> courseCodeList = new ArrayList<>();
|
|
if (!CollectionUtils.isEmpty(studentEntityList)) {
|
|
if (!CollectionUtils.isEmpty(studentEntityList)) {
|
|
- courseCodeList = studentEntityList.stream().map(m -> m.getCourseCode()).distinct().collect(Collectors.toList());
|
|
|
|
|
|
+ courseCodeList = studentEntityList.stream().map(m -> m.getCourseCode()).distinct()
|
|
|
|
+ .collect(Collectors.toList());
|
|
}
|
|
}
|
|
return courseCodeList;
|
|
return courseCodeList;
|
|
}
|
|
}
|
|
@@ -82,7 +85,8 @@ public class ConditionController {
|
|
/**
|
|
/**
|
|
* 考点列表
|
|
* 考点列表
|
|
*
|
|
*
|
|
- * @param examId 批次ID
|
|
|
|
|
|
+ * @param examId
|
|
|
|
+ * 批次ID
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/list_exam_site", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/list_exam_site", method = RequestMethod.POST)
|
|
@@ -98,7 +102,8 @@ public class ConditionController {
|
|
/**
|
|
/**
|
|
* 考场列表
|
|
* 考场列表
|
|
*
|
|
*
|
|
- * @param examId 批次ID
|
|
|
|
|
|
+ * @param examId
|
|
|
|
+ * 批次ID
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/list_exam_room", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/list_exam_room", method = RequestMethod.POST)
|