|
|
@@ -463,11 +463,7 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
|
|
|
Integer count = answerCountMap.get(assessmentQuestion.getParentId().toString() + assessmentQuestion.getId().toString());
|
|
|
questionVo.setCount(count == null?0:count);
|
|
|
|
|
|
- BigDecimal bigDecimal = BigDecimal.valueOf(questionVo.getCount())
|
|
|
- .divide(BigDecimal.valueOf(vo.getStudentCount()))
|
|
|
- .multiply(BigDecimal.valueOf(100))
|
|
|
- .setScale(2, RoundingMode.HALF_UP);
|
|
|
- questionVo.setPercentage(bigDecimal.floatValue());
|
|
|
+ questionVo.setPercentage(vo.getStudentCount());
|
|
|
optionList.add(questionVo);
|
|
|
}
|
|
|
}
|
|
|
@@ -476,21 +472,13 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
|
|
|
optionList.add(new AssessmentQuestionOptionResultVo(){{
|
|
|
setName("是");
|
|
|
Integer count = answerCountMap.get(twoQuestion.getId().toString() + "1");
|
|
|
- BigDecimal bigDecimal = BigDecimal.valueOf(count == null?0:count)
|
|
|
- .divide(BigDecimal.valueOf(vo.getStudentCount()))
|
|
|
- .multiply(BigDecimal.valueOf(100))
|
|
|
- .setScale(2, RoundingMode.HALF_UP);
|
|
|
- setPercentage(bigDecimal.floatValue());
|
|
|
+ setPercentage(vo.getStudentCount());
|
|
|
setCount(count == null?0:count);
|
|
|
}});
|
|
|
optionList.add(new AssessmentQuestionOptionResultVo(){{
|
|
|
setName("否");
|
|
|
Integer count = answerCountMap.get(twoQuestion.getId().toString() + "2");
|
|
|
- BigDecimal bigDecimal = BigDecimal.valueOf(count == null?0:count)
|
|
|
- .divide(BigDecimal.valueOf(vo.getStudentCount()))
|
|
|
- .multiply(BigDecimal.valueOf(100))
|
|
|
- .setScale(2, RoundingMode.HALF_UP);
|
|
|
- setPercentage(bigDecimal.floatValue());
|
|
|
+ setPercentage(vo.getStudentCount());
|
|
|
setCount(count == null?0:count);
|
|
|
}});
|
|
|
}else if("scale_question".equals(twoQuestion.getType())) {
|
|
|
@@ -499,10 +487,7 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
|
|
|
optionList.add(new AssessmentQuestionOptionResultVo(){{
|
|
|
setName(detailVo.getAnswerId());
|
|
|
Integer count = detailVo.getChooseCount();
|
|
|
- BigDecimal bigDecimal = BigDecimal.valueOf(count == null?0:count)
|
|
|
- .divide(BigDecimal.valueOf(vo.getStudentCount())).multiply(BigDecimal.valueOf(100))
|
|
|
- .setScale(2, RoundingMode.HALF_UP);
|
|
|
- setPercentage(bigDecimal.floatValue());
|
|
|
+ setPercentage(vo.getStudentCount());
|
|
|
setCount(count == null?0:count);
|
|
|
}});
|
|
|
}
|