From 0057ef145ab05b6c34802deb4ff575f975b6283a Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 16 五月 2024 18:19:15 +0800
Subject: [PATCH] feat：部门管理员功能权限控制
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 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..e903f59 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
@@ -1,27 +1,33 @@
package com.mindskip.xzs.controller.admin;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
+import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.domain.ExamPaperAnswer;
import com.mindskip.xzs.domain.ExamPaperSubject;
import com.mindskip.xzs.domain.Subject;
-import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.exam.ExamPaperAnswerObject;
-import com.mindskip.xzs.service.*;
+import com.mindskip.xzs.domain.vo.ExamPaperStatisticVO;
+import com.mindskip.xzs.service.ExamPaperAnswerService;
+import com.mindskip.xzs.service.ExamPaperSubjectService;
+import com.mindskip.xzs.service.SubjectService;
+import com.mindskip.xzs.service.UserService;
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.utility.ExamUtil;
import com.mindskip.xzs.utility.PageInfoHelper;
-import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperAnswerPageRequestVM;
-import com.github.pagehelper.PageInfo;
+import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
+import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@RestController("AdminExamPaperAnswerController")
@@ -48,10 +54,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 +74,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 +108,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);
@@ -111,4 +119,10 @@
}
return RestResponse.ok(object);
}
+
+ @RequestMapping(value = "/statistic", method = RequestMethod.POST)
+ public RestResponse<Map<String, Object>> statistic(@RequestBody ExamPaperStatisticVO examPaperStatisticVO) {
+ examPaperStatisticVO.setDepartmentId(isDeptAdmin() ? getAdminDeptIds() : null);
+ return RestResponse.ok(examPaperAnswerService.statistic(examPaperStatisticVO));
+ }
}
--
Gitblit v1.8.0