|
@@ -158,7 +158,7 @@ public class MakrerApi {
|
|
|
|
|
|
//当前老师当前档位评档次数(所有考试)
|
|
|
int countNew = markTaskRepo.countByQuestionIdAndStageAndResultAndIsMissing(questionId, MarkStage.LEVEL.ordinal(), level.getCode(), false, batchNo, marker.getId());
|
|
|
- dto.setPercent(countNew == 0 ? 0D : dto.getPercent());
|
|
|
+// dto.setPercent(countNew == 0 ? 0D : dto.getPercent());
|
|
|
dto.setCount(countNew);
|
|
|
levelStatDTOs.add(dto);
|
|
|
}
|
|
@@ -189,6 +189,10 @@ public class MakrerApi {
|
|
|
double gp = (double) o.getGcount() / finalTotal;
|
|
|
BigDecimal gbd = new BigDecimal(gp).setScale(3, RoundingMode.HALF_EVEN);
|
|
|
o.setGpercent(gbd.doubleValue());
|
|
|
+
|
|
|
+ int count = markTaskRepo.countByQuestionIdAndMarkerIdAndStageAndResult(questionId, marker.getId(), MarkStage.LEVEL.ordinal(), o.getId().toString(), batchNo);
|
|
|
+ o.setPercent(count == 0 ? 0 : o.getPercent());
|
|
|
+ o.setCount(count);
|
|
|
}
|
|
|
});
|
|
|
return levelStatDTOs;
|