查询成绩接口合拼

jkt-admin/src/main/java/com/miaxis/app/controller/score/ScoreInfoController.java

@@ -10,6 +10,7 @@ import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.question.domain.QuestionCollection;
 import com.miaxis.score.domain.ScoreInfo;
+import com.miaxis.score.dto.ScoreInfoAllDTO;
 import com.miaxis.score.dto.ScoreInfoDTO;
 import com.miaxis.score.service.IScoreInfoService;
 import io.swagger.annotations.*;
@@ -107,29 +108,39 @@ public class ScoreInfoController extends BaseController{
     /**
      * 获取预测成功
      */
-    @GetMapping(value = "/forecastScore")
-    @ApiOperation("获取预测成绩")
-    public Response<Integer> getInfo(){
-        ScoreInfo scoreInfo = new ScoreInfo();
-        scoreInfo.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-        int forecastScore = scoreInfoService.getForecastScore(scoreInfo);
-//        Map<String,Object> map = new HashMap<String,Object>();
-//        map.put("forecastScore",forecastScore);
-        return Response.success(forecastScore);
-    }
+//    @GetMapping(value = "/forecastScore")
+//    @ApiOperation("获取预测成绩")
+//    public Response<Integer> getInfo(){
+//        ScoreInfo scoreInfo = new ScoreInfo();
+//        scoreInfo.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+//        int forecastScore = scoreInfoService.getForecastScore(scoreInfo);
+//        return Response.success(forecastScore);
+//    }
 
 
     /**
      * 获取预测成功
      */
-    @GetMapping(value = "/avgScore")
-    @ApiOperation("获取平均成绩")
-    public Response<Integer> getAvgScore(){
+//    @GetMapping(value = "/avgScore")
+//    @ApiOperation("获取平均成绩")
+//    public Response<Integer> getAvgScore(){
+//        ScoreInfo scoreInfo = new ScoreInfo();
+//        scoreInfo.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+//        int aveScore = scoreInfoService.getAveScore(scoreInfo);
+//        return Response.success(aveScore);
+//    }
+
+
+
+    /**
+     * 获取最大成绩，平均成绩，预测成绩
+     */
+    @GetMapping(value = "/getScoreInfoAll")
+    @ApiOperation("获取最大成绩，平均成绩，预测成绩")
+    public Response<ScoreInfoAllDTO> getScoreInfoAll(){
         ScoreInfo scoreInfo = new ScoreInfo();
         scoreInfo.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
-        int aveScore = scoreInfoService.getAveScore(scoreInfo);
-//        Map<String,Object> map = new HashMap<String,Object>();
-//        map.put("forecastScore",forecastScore);
-        return Response.success(aveScore);
+        ScoreInfoAllDTO scoreInfoAllDTO = scoreInfoService.getScoreInfoAll(scoreInfo);
+        return Response.success(scoreInfoAllDTO);
     }
 }

jkt-service/src/main/java/com/miaxis/score/dto/ScoreInfoAllDTO.java

@@ -0,0 +1,31 @@
+package com.miaxis.score.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 模拟考成绩对象 score_info
+ *
+ * @author miaxis
+ * @date 2021-08-23
+ */
+@Data
+public class ScoreInfoAllDTO {
+    private static final long serialVersionUID = 1L;
+
+
+
+    /** 最大成绩 */
+    @ApiModelProperty(value = "最大成绩")
+    private Integer maxScore;
+
+    /** 平均成绩 */
+    @ApiModelProperty(value = "平均成绩")
+    private Integer avgScore;
+
+    /** 预测成绩 */
+    @ApiModelProperty(value = "预测成绩")
+    private Integer forecastScore;
+
+}

jkt-service/src/main/java/com/miaxis/score/mapper/ScoreInfoMapper.java

@@ -34,4 +34,11 @@ public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
      * @return
      */
     public List getLast10Score(ScoreInfo scoreInfo);
+
+    /**
+     * 返回最大成绩
+     * @param scoreInfo
+     * @return
+     */
+    public int getMaxScore(ScoreInfo scoreInfo);
 }

jkt-service/src/main/java/com/miaxis/score/service/IScoreInfoService.java

@@ -3,6 +3,7 @@ package com.miaxis.score.service;
 import java.util.List;
 import com.miaxis.score.domain.ScoreInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.score.dto.ScoreInfoAllDTO;
 
 /**
  * 模拟考成绩Service接口
@@ -32,4 +33,22 @@ public interface IScoreInfoService extends IService<ScoreInfo>{
      * @return
      */
     public int getForecastScore(ScoreInfo scoreInfo);
+
+
+    /**
+     * 最大成绩
+     * @param scoreInfo
+     * @return
+     */
+    public int getMaxScore(ScoreInfo scoreInfo);
+
+
+
+    /**
+     * 同时返回
+     * 最小成绩，最大成绩，平均成绩，预测成绩
+     * @param scoreInfo
+     * @return
+     */
+    public ScoreInfoAllDTO getScoreInfoAll(ScoreInfo scoreInfo);
 }

jkt-service/src/main/java/com/miaxis/score/service/impl/ScoreInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.miaxis.common.utils.DateUtils;
+import com.miaxis.score.dto.ScoreInfoAllDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -56,4 +57,21 @@ public class ScoreInfoServiceImpl extends ServiceImpl<ScoreInfoMapper, ScoreInfo
     }
 
 
+
+    @Override
+    public int getMaxScore(ScoreInfo scoreInfo) {
+        int maxScore = scoreInfoMapper.getMaxScore(scoreInfo);
+        return maxScore;
+    }
+
+
+    @Override
+    public ScoreInfoAllDTO getScoreInfoAll(ScoreInfo scoreInfo) {
+        ScoreInfoAllDTO scoreInfoAllDTO = new ScoreInfoAllDTO();
+        scoreInfoAllDTO.setAvgScore(this.getAveScore(scoreInfo));
+        scoreInfoAllDTO.setForecastScore(this.getForecastScore(scoreInfo));
+        scoreInfoAllDTO.setMaxScore(this.getMaxScore(scoreInfo));
+        return scoreInfoAllDTO;
+    }
+
 }

jkt-service/src/main/resources/mapper/score/ScoreInfoMapper.xml

@@ -47,21 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="getMinScore" parameterType="ScoreInfo" resultType="int">
-        select min(score) from score_info s
-        <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="kskm != null  and kskm != ''"> and kskm = #{kskm}</if>
-        </where>
-    </select>
-
     <select id="getMaxScore" parameterType="ScoreInfo" resultType="int">
         select max(score) from score_info s
         <where>
             <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="kskm != null  and kskm != ''"> and kskm = #{kskm}</if>
         </where>
     </select>