From ccca8c65b3c76a9021a471a3667d61d965a4f2cb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 11 五月 2024 18:04:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
index 344b712..75beda4 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
@@ -21,6 +21,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;
@@ -48,10 +49,10 @@
PageInfo<ExamPaperAnswerPageResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
ExamPaperAnswerPageResponseVM vm = modelMapper.map(e, ExamPaperAnswerPageResponseVM.class);
- User user = userService.selectByIdName(e.getCreateUser(), model.getUserName());
- if (user == null) {
- return null;
- }
+// User user = userService.selectByIdName(e.getCreateUser(), model.getUserName());
+// if (user == null) {
+// return null;
+// }
// Subject subject = subjectService.selectById(vm.getSubjectId());
ExamPaperAnswer examPaperAnswer = examPaperAnswerService.getById(vm.getId());
Integer[] ids = examPaperSubjectService.getByExamPaperId(examPaperAnswer.getExamPaperId())
@@ -68,11 +69,11 @@
vm.setSubjectName(name);
vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- vm.setUserName(user.getUserName());
+// vm.setUserName(user.getRealName());
return vm;
});
- page.setList(page.getList().stream().filter(e -> e != null).collect(Collectors.toList()));
- if (page.getSize() > 0) {
+// page.setList(page.getList().stream().filter(e -> e != null).collect(Collectors.toList()));
+ if (page.getList().size() > 0) {
Double avg = page.getList().stream().mapToInt(ExamPaperAnswerPageResponseVM -> Integer.parseInt(ExamPaperAnswerPageResponseVM.getUserScore())).average().getAsDouble();
page.getList().get(0).setAvgSource(avg);
}
@@ -102,8 +103,10 @@
Integer max = examPaperAnswers.stream().map(ExamPaperAnswer::getUserScore).max(Integer::compareTo).get();
Integer min = examPaperAnswers.stream().map(ExamPaperAnswer::getUserScore).min(Integer::compareTo).get();
Double avg = examPaperAnswers.stream().mapToDouble(ExamPaperAnswer::getUserScore).average().getAsDouble();
+ BigDecimal two = new BigDecimal(avg);
+ Double three = two.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
object.setAdvanced(advanced);
- object.setAvg(avg);
+ object.setAvg(three);
object.setIntermediate(intermediate);
object.setMax(max);
object.setMin(min);
--
Gitblit v1.8.0