From 87b98e8959b412e3a38376202b9813a17febeb65 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 7 Aug 2024 11:40:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=80=83=E8=AF=95=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manager/UserExamManager.java | 5 +++ .../system/count/TdExamnumController.java | 7 ++++ .../userexam/dto/response/ExamCountDTO.java | 36 +++++++++++++++++++ .../ruoyi/system/mapper/ElUserExamMapper.java | 4 +++ .../system/service/ElUserExamService.java | 4 +++ .../service/impl/ElUserExamServiceImpl.java | 6 ++++ .../mapper/system/ElUserExamMapper.xml | 16 +++++++++ 7 files changed, 78 insertions(+) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/userexam/dto/response/ExamCountDTO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserExamManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserExamManager.java index 3b35830..4b58bc2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserExamManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserExamManager.java @@ -4,6 +4,7 @@ import com.ruoyi.system.domain.paper.dto.request.PaperListReqDTO; import com.ruoyi.system.domain.paper.dto.response.PaperListRespDTO; import com.ruoyi.system.domain.userexam.ElUserExam; import com.ruoyi.system.domain.userexam.dto.request.UserExamReqDTO; +import com.ruoyi.system.domain.userexam.dto.response.ExamCountDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamCountDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamRespDTO; import com.ruoyi.system.service.ElPaperService; @@ -96,4 +97,8 @@ public class UserExamManager { return elUserExamService.selectCountList(); } + public List selectCountExam(){ + return elUserExamService.selectCountExam(); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java index 2bc6649..6c9b494 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java @@ -92,5 +92,12 @@ public class TdExamnumController extends BaseController { return AjaxResult.success(userExamManager.selectCountList()); } + @ApiOperation("最新考试列表") + @PostMapping("/countExamList") + @ResponseBody + public AjaxResult countExamList() { + return AjaxResult.success(userExamManager.selectCountExam()); + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/userexam/dto/response/ExamCountDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/userexam/dto/response/ExamCountDTO.java new file mode 100644 index 0000000..248d7c7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/userexam/dto/response/ExamCountDTO.java @@ -0,0 +1,36 @@ +package com.ruoyi.system.domain.userexam.dto.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * packageName com.ruoyi.system.domain.userexam.dto.response + * + * @author wangxy + * @version JDK 8 + * @className ExamCountDTO + * @date 2024/8/7 + * @description 考试统计 + */ +@Data +@ApiModel(value="考试统计", description="考试统计") +public class ExamCountDTO implements Serializable { + + @ApiModelProperty(value = "考试id") + private String examId; + + @ApiModelProperty(value = "考试名称") + private String title; + + @ApiModelProperty(value = "总数") + private Integer total; + + @ApiModelProperty(value = "通过数") + private Integer tg; + + @ApiModelProperty(value = "未通过数") + private Integer wtg; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ElUserExamMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ElUserExamMapper.java index cf9edba..2e362fb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ElUserExamMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ElUserExamMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.userexam.ElUserExam; import com.ruoyi.system.domain.userexam.dto.request.UserExamReqDTO; +import com.ruoyi.system.domain.userexam.dto.response.ExamCountDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamCountDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamRespDTO; import org.apache.ibatis.annotations.Mapper; @@ -24,6 +25,9 @@ public interface ElUserExamMapper extends BaseMapper { public UserExamCountDTO selectCountList(); + + public List selectCountExam(); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ElUserExamService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ElUserExamService.java index f90fc15..9f0bc63 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ElUserExamService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ElUserExamService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.domain.exam.dto.ExamDTO; import com.ruoyi.system.domain.userexam.ElUserExam; import com.ruoyi.system.domain.userexam.dto.request.UserExamReqDTO; +import com.ruoyi.system.domain.userexam.dto.response.ExamCountDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamCountDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamRespDTO; @@ -23,4 +24,7 @@ public interface ElUserExamService extends IService { public UserExamCountDTO selectCountList(); + + public List selectCountExam(); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ElUserExamServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ElUserExamServiceImpl.java index b1a963e..9621c11 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ElUserExamServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ElUserExamServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.exam.dto.ExamDTO; import com.ruoyi.system.domain.userexam.ElUserExam; import com.ruoyi.system.domain.userexam.dto.request.UserExamReqDTO; +import com.ruoyi.system.domain.userexam.dto.response.ExamCountDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamCountDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamRespDTO; import com.ruoyi.system.mapper.ElUserExamMapper; @@ -34,6 +35,11 @@ public class ElUserExamServiceImpl extends ServiceImpl selectCountExam() { + return userExamMapper.selectCountExam(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/ElUserExamMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ElUserExamMapper.xml index d0e1117..c0a2146 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ElUserExamMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ElUserExamMapper.xml @@ -51,5 +51,21 @@ ORDER BY u.create_time + + + +