|
|
@@ -277,10 +277,10 @@ public class MakrerApi {
|
|
|
public Map<String, Long> call() throws Exception {
|
|
|
Map<String, Long> map = new HashMap<>();
|
|
|
//当前老师当前试卷的评档次数(不分档位)
|
|
|
- long kdtotal = markTaskRepo.countScoreByQuestionId(questionId, batchNo, marker.getId());
|
|
|
+// long kdtotal = markTaskRepo.countScoreByQuestionId(questionId, batchNo, marker.getId());
|
|
|
//当前老师所有的评档次数(不分档位)
|
|
|
long total = paperRepo.countByWorkIdAndQuestionId(markSubject.getWorkId(), questionId);
|
|
|
- map.put("kdtotal", kdtotal);
|
|
|
+// map.put("kdtotal", kdtotal);
|
|
|
map.put("total", total);
|
|
|
return map;
|
|
|
}
|
|
|
@@ -307,12 +307,12 @@ public class MakrerApi {
|
|
|
dto.setPercent(0.0);
|
|
|
|
|
|
//当前老师当前档位评档次数(所有考试)
|
|
|
- int countNew;
|
|
|
- if (ParamCache.paramMap.get(marker.getWorkId()).getScoreShowAllPaper() == 1) {
|
|
|
+ int countNew = 0;
|
|
|
+ /*if (ParamCache.paramMap.get(marker.getWorkId()).getScoreShowAllPaper() == 1) {
|
|
|
countNew = markTaskRepo.countScoreByQuestionIdAndStageAndResultAndIsMissingAll(questionId, MarkStage.SCORE.ordinal(), level.getCode(), false, marker.getId());
|
|
|
} else {
|
|
|
countNew = markTaskRepo.countScoreByQuestionIdAndStageAndResultAndIsMissing(questionId, MarkStage.SCORE.ordinal(), level.getCode(), false, batchNo, marker.getId());
|
|
|
- }
|
|
|
+ }*/
|
|
|
dto.setCount(countNew);
|
|
|
levelStatDTOs.add(dto);
|
|
|
}
|
|
|
@@ -320,7 +320,7 @@ public class MakrerApi {
|
|
|
long kdtotal = 0L, total = 0L;
|
|
|
if (Objects.nonNull(future) && Objects.nonNull(future.get())) {
|
|
|
Map<String, Long> map = (Map<String, Long>) future.get();
|
|
|
- kdtotal = map.get("kdtotal");
|
|
|
+// kdtotal = map.get("kdtotal");
|
|
|
total = map.get("total");
|
|
|
}
|
|
|
|
xiaof