From 00fe3336b89c3c24ffe2826f45419d8e7dbb17fc Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期四, 23 五月 2024 15:46:57 +0800 Subject: [PATCH] feat:统计新需求 --- src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 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 2a86dae..d70659e 100644 --- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java +++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java @@ -8,6 +8,8 @@ import com.mindskip.xzs.domain.ExamPaperSubject; import com.mindskip.xzs.domain.Subject; import com.mindskip.xzs.domain.exam.ExamPaperAnswerObject; +import com.mindskip.xzs.domain.vo.ExamPaperDataVO; +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; @@ -17,8 +19,12 @@ import com.mindskip.xzs.utility.PageInfoHelper; import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperAnswerPageRequestVM; import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM; +import org.apache.commons.lang3.ObjectUtils; 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; @@ -116,8 +122,14 @@ return RestResponse.ok(object); } - @RequestMapping(value = "/statistic", method = RequestMethod.GET) - public RestResponse<Map<String, Object>> statistic(String examPaperId, String departmentId) { - return RestResponse.ok(examPaperAnswerService.statistic(examPaperId, departmentId)); + @RequestMapping(value = "/statistic", method = RequestMethod.POST) + public RestResponse<Map<String, Object>> statistic(@RequestBody ExamPaperStatisticVO examPaperStatisticVO) { + examPaperStatisticVO.setDepartmentId(ObjectUtils.isNotEmpty(examPaperStatisticVO.getDepartmentId()) ? examPaperStatisticVO.getDepartmentId() : getAdminDeptIds()); + return RestResponse.ok(examPaperAnswerService.statistic(examPaperStatisticVO)); + } + + @RequestMapping(value = "/data", method = RequestMethod.POST) + public RestResponse<Map<String, Object>> data(@RequestBody ExamPaperDataVO examPaperDataVO) { + return RestResponse.ok(examPaperAnswerService.data(examPaperDataVO)); } } -- Gitblit v1.8.0