|
@@ -420,120 +420,4 @@ public class MarkQualityController extends BaseApiController {
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
- // @RequestMapping("/getChart")
|
|
|
|
- // @ResponseBody
|
|
|
|
- // public List<MarkerVO> getChart(HttpServletRequest request, @RequestParam
|
|
|
|
- // String subjectCode,
|
|
|
|
- // @RequestParam Integer groupNumber, @RequestParam(required = false)
|
|
|
|
- // Boolean marked,
|
|
|
|
- // @RequestParam(required = false) Boolean noArbitrate) {
|
|
|
|
- // int examId = getSessionExamId(request);
|
|
|
|
- // List<MarkerVO> list = new ArrayList<MarkerVO>();
|
|
|
|
- // List<Marker> markers = null;
|
|
|
|
- // if (marked != null && marked) {
|
|
|
|
- // markers = markerService.findByExamAndSubjectAndGroupMarked(examId,
|
|
|
|
- // subjectCode, groupNumber);
|
|
|
|
- // } else {
|
|
|
|
- // markers = markerService.findByExamAndSubjectAndGroup(examId, subjectCode,
|
|
|
|
- // groupNumber);
|
|
|
|
- // }
|
|
|
|
- // for (Marker marker : markers) {
|
|
|
|
- // List<Object[]> libraries = null;
|
|
|
|
- // if (noArbitrate != null && noArbitrate) {
|
|
|
|
- // libraries = libraryService.findScoreCount(examId, subjectCode,
|
|
|
|
- // groupNumber, marker.getId(),
|
|
|
|
- // LibraryStatus.MARKED, LibraryStatus.INSPECTED);
|
|
|
|
- // } else {
|
|
|
|
- // libraries = libraryService.findScoreCount(examId, subjectCode,
|
|
|
|
- // groupNumber, marker.getId(),
|
|
|
|
- // LibraryStatus.MARKED, LibraryStatus.INSPECTED, LibraryStatus.ARBITRATED);
|
|
|
|
- // }
|
|
|
|
- // MarkLibrarySearchQuery query = new MarkLibrarySearchQuery();
|
|
|
|
- // query.setMarkerId(marker.getId());
|
|
|
|
- // query.addStatus(LibraryStatus.MARKED);
|
|
|
|
- // query.addStatus(LibraryStatus.INSPECTED);
|
|
|
|
- // if (noArbitrate == null || !noArbitrate) {
|
|
|
|
- // query.addStatus(LibraryStatus.ARBITRATED);
|
|
|
|
- // }
|
|
|
|
- // long totalCount = libraryService.countByQuery(query);
|
|
|
|
- // Map<Double, Double> scorePercent = new HashMap<Double, Double>();
|
|
|
|
- // for (Object[] array : libraries) {
|
|
|
|
- // Double score = (Double) array[0];
|
|
|
|
- // Long count = (Long) array[1];
|
|
|
|
- // double percent = 0;
|
|
|
|
- // if (totalCount != 0) {
|
|
|
|
- // percent = count * 100 / totalCount;
|
|
|
|
- // }
|
|
|
|
- // scorePercent.put(score, percent);
|
|
|
|
- // }
|
|
|
|
- // User user = userService.findById(marker.getUserId());
|
|
|
|
- // MarkerVO vo = new MarkerVO();
|
|
|
|
- // vo.setId(marker.getId());
|
|
|
|
- // vo.setLoginName(user.getLoginName());
|
|
|
|
- // vo.setName(user.getName());
|
|
|
|
- // vo.setScorePercent(scorePercent);
|
|
|
|
- // list.add(vo);
|
|
|
|
- // }
|
|
|
|
- // return list;
|
|
|
|
- // }
|
|
|
|
- //
|
|
|
|
- // @Logging(menu = "质量监控查询给分记录详情", type = LogType.QUERY)
|
|
|
|
- // @RequestMapping(value = "/history", method = RequestMethod.POST)
|
|
|
|
- // @ResponseBody
|
|
|
|
- // @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.COLLEGE_ADMIN
|
|
|
|
- // })
|
|
|
|
- // public List<Task> getTask(HttpServletRequest request, @RequestParam
|
|
|
|
- // Integer markerId,
|
|
|
|
- // @RequestParam Double markerScore, @RequestParam(required = false) Integer
|
|
|
|
- // pageNumber,
|
|
|
|
- // @RequestParam(required = false) Integer pageSize, @RequestParam(required
|
|
|
|
- // = false) Boolean noArbitrate) {
|
|
|
|
- // Marker marker = markerService.findById(markerId);
|
|
|
|
- // List<Task> list = new ArrayList<>();
|
|
|
|
- // MarkGroup group = groupService.findOne(marker.getExamId(),
|
|
|
|
- // marker.getSubjectCode(), marker.getGroupNumber());
|
|
|
|
- // if (group != null && group.getStatus() != MarkStatus.TRIAL) {
|
|
|
|
- // // 正评查找已给分的评卷任务
|
|
|
|
- // MarkLibrarySearchQuery query = new MarkLibrarySearchQuery();
|
|
|
|
- // query.setExamId(marker.getExamId());
|
|
|
|
- // query.setSubjectCode(marker.getSubjectCode());
|
|
|
|
- // query.setMarkerId(marker.getId());
|
|
|
|
- // query.addStatus(LibraryStatus.MARKED);
|
|
|
|
- // query.addStatus(LibraryStatus.INSPECTED);
|
|
|
|
- // if (noArbitrate == null || !noArbitrate) {
|
|
|
|
- // query.addStatus(LibraryStatus.ARBITRATED);
|
|
|
|
- // }
|
|
|
|
- // query.setGroupNumber(marker.getGroupNumber());
|
|
|
|
- // query.setMarkerScore(markerScore);
|
|
|
|
- // if (pageNumber != null) {
|
|
|
|
- // query.setPageNumber(pageNumber);
|
|
|
|
- // }
|
|
|
|
- // if (pageSize != null) {
|
|
|
|
- // query.setPageSize(pageSize);
|
|
|
|
- // }
|
|
|
|
- // query.orderByMarkerTimeDesc();
|
|
|
|
- //
|
|
|
|
- // list = taskService.findByQuery(query);
|
|
|
|
- // } else if (group != null && group.getStatus() == MarkStatus.TRIAL) {
|
|
|
|
- // // 试评查找给分历史记录
|
|
|
|
- // List<TrialLibrary> historyList = new ArrayList<TrialLibrary>();
|
|
|
|
- // historyList = trialService.findHistory(marker.getExamId(),
|
|
|
|
- // marker.getSubjectCode(), marker.getGroupNumber(),
|
|
|
|
- // marker.getId(), pageNumber, pageSize, null, markerScore);
|
|
|
|
- // for (TrialLibrary library : historyList) {
|
|
|
|
- // Task task = taskService.build(library);
|
|
|
|
- // list.add(task);
|
|
|
|
- // }
|
|
|
|
- // }
|
|
|
|
- // int examId = getSessionExamId(request);
|
|
|
|
- // Exam exam = examService.findById(examId);
|
|
|
|
- // WebUser user = RequestUtils.getWebUser(request);
|
|
|
|
- // for (Task task : list) {
|
|
|
|
- // if (exam.isForbiddenInfo() && !Role.SCHOOL_ADMIN.equals(user.getRole()))
|
|
|
|
- // {
|
|
|
|
- // task.setSecretNumber(DEFAULT_SECRET_NUMBER);
|
|
|
|
- // }
|
|
|
|
- // }
|
|
|
|
- // return list;
|
|
|
|
- // }
|
|
|
|
}
|
|
}
|