Commit 12386a01 authored by 陈立彬's avatar 陈立彬

fix

parent 69aba966
...@@ -22,6 +22,7 @@ import java.io.PrintWriter; ...@@ -22,6 +22,7 @@ import java.io.PrintWriter;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Controller @Controller
...@@ -82,8 +83,8 @@ public class H5Controller { ...@@ -82,8 +83,8 @@ public class H5Controller {
List<ElehSessionQaRecordDo> qaRecordDos = qaRecordMapper.selectList(queryWrapper); List<ElehSessionQaRecordDo> qaRecordDos = qaRecordMapper.selectList(queryWrapper);
if(!CollectionUtils.isEmpty(qaRecordDos)) { if(!CollectionUtils.isEmpty(qaRecordDos)) {
Double totalScore = qaRecordDos.stream().mapToDouble(ElehSessionQaRecordDo::getScore).sum(); Double totalScore = qaRecordDos.stream().filter(v -> Objects.nonNull(v.getScore())).mapToDouble(ElehSessionQaRecordDo::getScore).sum();
int examNum = qaRecordDos.size(); long examNum = qaRecordDos.stream().filter(v -> Objects.nonNull(v.getScore())).count();
DecimalFormat df = new DecimalFormat("#.##"); DecimalFormat df = new DecimalFormat("#.##");
String avgScore = df.format(totalScore / examNum); String avgScore = df.format(totalScore / examNum);
...@@ -107,10 +108,10 @@ public class H5Controller { ...@@ -107,10 +108,10 @@ public class H5Controller {
out.println("<p><strong>考试题目:</strong>"+knowledgeDo.getQuestion()+"</p>"); out.println("<p><strong>考试题目:</strong>"+knowledgeDo.getQuestion()+"</p>");
out.println("<p><strong>你的得分:</strong>"+v.getScore()+"</p>"); out.println("<p><strong>你的得分:</strong>"+getOrEmpty(v.getScore())+"</p>");
out.println("<p><strong>参考答案:</strong>"+knowledgeDo.getAnswer()+"</p>"); out.println("<p><strong>参考答案:</strong>"+knowledgeDo.getAnswer()+"</p>");
out.println("<p><strong>你的答案:</strong>"+v.getAnswer()+"</p>"); out.println("<p><strong>你的答案:</strong>"+getOrEmpty(v.getAnswer())+"</p>");
out.println("<p><strong>得分点评:</strong>"+v.getScoreCriteria()+"</p>"); out.println("<p><strong>得分点评:</strong>"+getOrEmpty(v.getScoreCriteria())+"</p>");
out.println("<br/>"); out.println("<br/>");
}); });
...@@ -125,4 +126,9 @@ public class H5Controller { ...@@ -125,4 +126,9 @@ public class H5Controller {
out.println("</html>"); out.println("</html>");
} }
private String getOrEmpty(Object str) {
str = Objects.isNull(str) ? "" : str;
return str.toString();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment