|
@@ -71,9 +71,7 @@ import io.swagger.annotations.ApiOperation;
|
|
|
@Transactional
|
|
|
@RestController
|
|
|
@RequestMapping("${$rmp.cloud.examwork}" + "examStudent")
|
|
|
-public class ExamStudentCloudServiceProvider extends ControllerSupport
|
|
|
- implements
|
|
|
- ExamStudentCloudService {
|
|
|
+public class ExamStudentCloudServiceProvider extends ControllerSupport implements ExamStudentCloudService {
|
|
|
|
|
|
private static final long serialVersionUID = -89062090947597841L;
|
|
|
|
|
@@ -207,8 +205,8 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
|
|
|
while (iterator.hasNext()) {
|
|
|
ExamStudentEntity es = iterator.next();
|
|
|
|
|
|
- ExamStudentEntity finded = examStudentRepo.findByExamIdAndStudentIdAndCourseId(examId2,
|
|
|
- es.getStudentId(), es.getCourseId());
|
|
|
+ ExamStudentEntity finded = examStudentRepo.findByExamIdAndStudentIdAndCourseId(examId2, es.getStudentId(),
|
|
|
+ es.getCourseId());
|
|
|
|
|
|
if (null == finded) {
|
|
|
ExamStudentEntity one = new ExamStudentEntity();
|
|
@@ -345,6 +343,7 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
|
|
|
examStudentBean.setExamSite(saved.getExamSite());
|
|
|
examStudentBean.setOrgId(saved.getOrgId());
|
|
|
examStudentBean.setOrgCode(saved.getOrgCode());
|
|
|
+ examStudentBean.setStudentName(saved.getName());
|
|
|
|
|
|
GetExamStudentResp resp = new GetExamStudentResp();
|
|
|
resp.setExamStudentBean(examStudentBean);
|
|
@@ -404,23 +403,19 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
|
|
|
predicates.add(cb.like(root.get("examSite"), toSqlSearchPattern(examSite)));
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(identityNumber)) {
|
|
|
- predicates.add(
|
|
|
- cb.like(root.get("identityNumber"), toSqlSearchPattern(identityNumber)));
|
|
|
+ predicates.add(cb.like(root.get("identityNumber"), toSqlSearchPattern(identityNumber)));
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(specialtyName)) {
|
|
|
- predicates
|
|
|
- .add(cb.like(root.get("specialtyName"), toSqlSearchPattern(specialtyName)));
|
|
|
+ predicates.add(cb.like(root.get("specialtyName"), toSqlSearchPattern(specialtyName)));
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(infoCollector)) {
|
|
|
- predicates
|
|
|
- .add(cb.like(root.get("infoCollector"), toSqlSearchPattern(infoCollector)));
|
|
|
+ predicates.add(cb.like(root.get("infoCollector"), toSqlSearchPattern(infoCollector)));
|
|
|
}
|
|
|
|
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
|
};
|
|
|
|
|
|
- PageRequest pageRequest = new PageRequest(curPage, pageSize,
|
|
|
- new Sort(Direction.DESC, "updateTime"));
|
|
|
+ PageRequest pageRequest = new PageRequest(curPage, pageSize, new Sort(Direction.DESC, "updateTime"));
|
|
|
|
|
|
Page<ExamStudentEntity> examStudents = examStudentRepo.findAll(specification, pageRequest);
|
|
|
|